[ooo-build-commit] .: 7 commits - desktop/util framework/uiconfig officecfg/registry readlicense_oo/makefile.mk readlicense_oo/odt readlicense_oo/prj readlicense_oo/source sfx2/inc sfx2/sdi sfx2/source svx/inc sysui/desktop

Mon Sep 27 23:49:53 PDT 2010

desktop/util/ooverinfo.rc                                                     |    4 
 desktop/util/template.manifest                                                |    2 
 desktop/util/verinfo.rc                                                       |    4 
 dev/null                                                                      |binary
 framework/uiconfig/startmodule/menubar/menubar.xml                            |    2 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu          |    4 
 readlicense_oo/makefile.mk                                                    |    4 
 readlicense_oo/odt/LICENSE.odt                                                |binary
 readlicense_oo/odt/makefile.mk                                                |   46 ++++++++
 readlicense_oo/prj/build.lst                                                  |    1 
 readlicense_oo/prj/d.lst                                                      |    4 
 readlicense_oo/source/license/license_en-US.txt                               |    4 
 sfx2/inc/sfx2/sfxsids.hrc                                                     |    2 
 sfx2/sdi/appslots.sdi                                                         |    2 
 sfx2/sdi/sfx.sdi                                                              |    2 
 sfx2/source/appl/appserv.cxx                                                  |   57 +++++++---
 svx/inc/globlmn_tmpl.hrc                                                      |   12 +-
 sysui/desktop/debian/control                                                  |    8 -
 sysui/desktop/debian/openoffice.org-debian-menus                              |   12 +-
 sysui/desktop/debian/postinst                                                 |    4 
 sysui/desktop/freedesktop/freedesktop-menus.spec                              |    6 -
 sysui/desktop/icons/database.ico                                              |binary
 sysui/desktop/icons/drawing-template.icns                                     |binary
 sysui/desktop/icons/drawing-template.ico                                      |binary
 sysui/desktop/icons/drawing.icns                                              |binary
 sysui/desktop/icons/drawing.ico                                               |binary
 sysui/desktop/icons/empty-document.icns                                       |binary
 sysui/desktop/icons/empty-document.ico                                        |binary
 sysui/desktop/icons/empty-template.icns                                       |binary
 sysui/desktop/icons/empty-template.ico                                        |binary
 sysui/desktop/icons/formula.icns                                              |binary
 sysui/desktop/icons/formula.ico                                               |binary
 sysui/desktop/icons/hicolor/128x128/apps/base.png                             |binary
 sysui/desktop/icons/hicolor/128x128/apps/calc.png                             |binary
 sysui/desktop/icons/hicolor/128x128/apps/draw.png                             |binary
 sysui/desktop/icons/hicolor/128x128/apps/impress.png                          |binary
 sysui/desktop/icons/hicolor/128x128/apps/main.png                             |binary
 sysui/desktop/icons/hicolor/128x128/apps/math.png                             |binary
 sysui/desktop/icons/hicolor/128x128/apps/startcenter.png                      |binary
 sysui/desktop/icons/hicolor/128x128/apps/writer.png                           |binary
 sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-database.png              |binary
 sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing-template.png      |binary
 sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing.png               |binary
 sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-formula.png               |binary
 sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-master-document.png       |binary
 sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation-template.png |binary
 sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation.png          |binary
 sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.png  |binary
 sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.png           |binary
 sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text-template.png         |binary
 sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text.png                  |binary
 sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-web-template.png          |binary
 sysui/desktop/icons/hicolor/16x16/apps/base.png                               |binary
 sysui/desktop/icons/hicolor/16x16/apps/calc.png                               |binary
 sysui/desktop/icons/hicolor/16x16/apps/draw.png                               |binary
 sysui/desktop/icons/hicolor/16x16/apps/impress.png                            |binary
 sysui/desktop/icons/hicolor/16x16/apps/math.png                               |binary
 sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png                       |binary
 sysui/desktop/icons/hicolor/16x16/apps/startcenter.png                        |binary
 sysui/desktop/icons/hicolor/16x16/apps/writer.png                             |binary
 sysui/desktop/icons/hicolor/16x16/mimetypes/database.png                      |binary
 sysui/desktop/icons/hicolor/16x16/mimetypes/drawing-template.png              |binary
 sysui/desktop/icons/hicolor/16x16/mimetypes/drawing.png                       |binary
 sysui/desktop/icons/hicolor/16x16/mimetypes/formula.png                       |binary
 sysui/desktop/icons/hicolor/16x16/mimetypes/master-document.png               |binary
 sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-database.png                |binary
 sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing-template.png        |binary
 sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing.png                 |binary
 sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png                 |binary
 sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-master-document.png         |binary
 sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation-template.png   |binary
 sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation.png            |binary
 sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.png    |binary
 sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.png             |binary
 sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text-template.png           |binary
 sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.png                    |binary
 sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-web-template.png            |binary
 sysui/desktop/icons/hicolor/16x16/mimetypes/presentation-template.png         |binary
 sysui/desktop/icons/hicolor/16x16/mimetypes/presentation.png                  |binary
 sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet-template.png          |binary
 sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet.png                   |binary
 sysui/desktop/icons/hicolor/16x16/mimetypes/text-template.png                 |binary
 sysui/desktop/icons/hicolor/16x16/mimetypes/text.png                          |binary
 sysui/desktop/icons/hicolor/32x32/apps/base.png                               |binary
 sysui/desktop/icons/hicolor/32x32/apps/calc.png                               |binary
 sysui/desktop/icons/hicolor/32x32/apps/draw.png                               |binary
 sysui/desktop/icons/hicolor/32x32/apps/impress.png                            |binary
 sysui/desktop/icons/hicolor/32x32/apps/math.png                               |binary
 sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png                       |binary
 sysui/desktop/icons/hicolor/32x32/apps/startcenter.png                        |binary
 sysui/desktop/icons/hicolor/32x32/apps/writer.png                             |binary
 sysui/desktop/icons/hicolor/32x32/mimetypes/database.png                      |binary
 sysui/desktop/icons/hicolor/32x32/mimetypes/drawing-template.png              |binary
 sysui/desktop/icons/hicolor/32x32/mimetypes/drawing.png                       |binary
 sysui/desktop/icons/hicolor/32x32/mimetypes/formula.png                       |binary
 sysui/desktop/icons/hicolor/32x32/mimetypes/master-document.png               |binary
 sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-database.png                |binary
 sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing-template.png        |binary
 sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing.png                 |binary
 sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-formula.png                 |binary
 sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-master-document.png         |binary
 sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation-template.png   |binary
 sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation.png            |binary
 sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.png    |binary
 sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.png             |binary
 sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text-template.png           |binary
 sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.png                    |binary
 sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-web-template.png            |binary
 sysui/desktop/icons/hicolor/32x32/mimetypes/presentation-template.png         |binary
 sysui/desktop/icons/hicolor/32x32/mimetypes/presentation.png                  |binary
 sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet-template.png          |binary
 sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet.png                   |binary
 sysui/desktop/icons/hicolor/32x32/mimetypes/text-template.png                 |binary
 sysui/desktop/icons/hicolor/32x32/mimetypes/text.png                          |binary
 sysui/desktop/icons/hicolor/48x48/apps/base.png                               |binary
 sysui/desktop/icons/hicolor/48x48/apps/calc.png                               |binary
 sysui/desktop/icons/hicolor/48x48/apps/draw.png                               |binary
 sysui/desktop/icons/hicolor/48x48/apps/impress.png                            |binary
 sysui/desktop/icons/hicolor/48x48/apps/math.png                               |binary
 sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png                       |binary
 sysui/desktop/icons/hicolor/48x48/apps/startcenter.png                        |binary
 sysui/desktop/icons/hicolor/48x48/apps/writer.png                             |binary
 sysui/desktop/icons/hicolor/48x48/mimetypes/database.png                      |binary
 sysui/desktop/icons/hicolor/48x48/mimetypes/drawing-template.png              |binary
 sysui/desktop/icons/hicolor/48x48/mimetypes/drawing.png                       |binary
 sysui/desktop/icons/hicolor/48x48/mimetypes/formula.png                       |binary
 sysui/desktop/icons/hicolor/48x48/mimetypes/master-document.png               |binary
 sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-database.png                |binary
 sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png        |binary
 sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing.png                 |binary
 sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-formula.png                 |binary
 sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-master-document.png         |binary
 sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation-template.png   |binary
 sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation.png            |binary
 sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.png    |binary
 sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.png             |binary
 sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text-template.png           |binary
 sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text.png                    |binary
 sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-web-template.png            |binary
 sysui/desktop/icons/hicolor/48x48/mimetypes/presentation-template.png         |binary
 sysui/desktop/icons/hicolor/48x48/mimetypes/presentation.png                  |binary
 sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet-template.png          |binary
 sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet.png                   |binary
 sysui/desktop/icons/hicolor/48x48/mimetypes/text-template.png                 |binary
 sysui/desktop/icons/hicolor/48x48/mimetypes/text.png                          |binary
 sysui/desktop/icons/main.icns                                                 |binary
 sysui/desktop/icons/master-document.icns                                      |binary
 sysui/desktop/icons/master-document.ico                                       |binary
 sysui/desktop/icons/oasis-database.icns                                       |binary
 sysui/desktop/icons/oasis-database.ico                                        |binary
 sysui/desktop/icons/oasis-drawing-template.icns                               |binary
 sysui/desktop/icons/oasis-drawing-template.ico                                |binary
 sysui/desktop/icons/oasis-drawing.icns                                        |binary
 sysui/desktop/icons/oasis-drawing.ico                                         |binary
 sysui/desktop/icons/oasis-empty-document.ico                                  |binary
 sysui/desktop/icons/oasis-empty-template.ico                                  |binary
 sysui/desktop/icons/oasis-formula.icns                                        |binary
 sysui/desktop/icons/oasis-formula.ico                                         |binary
 sysui/desktop/icons/oasis-master-document.icns                                |binary
 sysui/desktop/icons/oasis-master-document.ico                                 |binary
 sysui/desktop/icons/oasis-presentation-template.icns                          |binary
 sysui/desktop/icons/oasis-presentation-template.ico                           |binary
 sysui/desktop/icons/oasis-presentation.icns                                   |binary
 sysui/desktop/icons/oasis-presentation.ico                                    |binary
 sysui/desktop/icons/oasis-spreadsheet-template.icns                           |binary
 sysui/desktop/icons/oasis-spreadsheet-template.ico                            |binary
 sysui/desktop/icons/oasis-spreadsheet.icns                                    |binary
 sysui/desktop/icons/oasis-spreadsheet.ico                                     |binary
 sysui/desktop/icons/oasis-text-template.icns                                  |binary
 sysui/desktop/icons/oasis-text-template.ico                                   |binary
 sysui/desktop/icons/oasis-text.icns                                           |binary
 sysui/desktop/icons/oasis-text.ico                                            |binary
 sysui/desktop/icons/oasis-web-template.icns                                   |binary
 sysui/desktop/icons/oasis-web-template.ico                                    |binary
 sysui/desktop/icons/ooo3_base_app.ico                                         |binary
 sysui/desktop/icons/ooo3_calc_app.ico                                         |binary
 sysui/desktop/icons/ooo3_draw_app.ico                                         |binary
 sysui/desktop/icons/ooo3_impress_app.ico                                      |binary
 sysui/desktop/icons/ooo3_main_app.ico                                         |binary
 sysui/desktop/icons/ooo3_math_app.ico                                         |binary
 sysui/desktop/icons/ooo3_open.ico                                             |binary
 sysui/desktop/icons/ooo3_writer_app.ico                                       |binary
 sysui/desktop/icons/presentation-template.icns                                |binary
 sysui/desktop/icons/presentation-template.ico                                 |binary
 sysui/desktop/icons/presentation.icns                                         |binary
 sysui/desktop/icons/presentation.ico                                          |binary
 sysui/desktop/icons/so9_base_app.ico                                          |binary
 sysui/desktop/icons/so9_calc_app.ico                                          |binary
 sysui/desktop/icons/so9_draw_app.ico                                          |binary
 sysui/desktop/icons/so9_impress_app.ico                                       |binary
 sysui/desktop/icons/so9_main_app.ico                                          |binary
 sysui/desktop/icons/so9_math_app.ico                                          |binary
 sysui/desktop/icons/so9_writer_app.ico                                        |binary
 sysui/desktop/icons/spreadsheet-template.icns                                 |binary
 sysui/desktop/icons/spreadsheet-template.ico                                  |binary
 sysui/desktop/icons/spreadsheet.icns                                          |binary
 sysui/desktop/icons/spreadsheet.ico                                           |binary
 sysui/desktop/icons/text-template.icns                                        |binary
 sysui/desktop/icons/text-template.ico                                         |binary
 sysui/desktop/icons/text.icns                                                 |binary
 sysui/desktop/icons/text.ico                                                  |binary
 sysui/desktop/mandriva/mandriva-menus.spec                                    |    6 -
 sysui/desktop/menus/base.desktop                                              |    2 
 sysui/desktop/menus/calc.desktop                                              |    2 
 sysui/desktop/menus/draw.desktop                                              |    2 
 sysui/desktop/menus/impress.desktop                                           |    2 
 sysui/desktop/menus/math.desktop                                              |    2 
 sysui/desktop/menus/printeradmin.desktop                                      |    2 
 sysui/desktop/menus/qstart.desktop                                            |    2 
 sysui/desktop/menus/startcenter.desktop                                       |    2 
 sysui/desktop/menus/writer.desktop                                            |    2 
 sysui/desktop/productversion.mk                                               |   14 +-
 sysui/desktop/redhat/redhat-menus.spec                                        |   10 -
 sysui/desktop/share/brand.pl                                                  |    4 
 sysui/desktop/share/create_mime_xml.pl                                        |    2 
 sysui/desktop/share/create_tree.sh                                            |    9 -
 sysui/desktop/share/launcher_comment.ulf                                      |    2 
 sysui/desktop/share/translate.pl                                              |    2 
 sysui/desktop/slackware/slack-desc                                            |    2 
 sysui/desktop/suse/suse-menus.spec                                            |    6 -
 220 files changed, 170 insertions(+), 85 deletions(-)

New commits:
commit 2c1320a1d3e5faee6c0176f62275816c78d3da24
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Sep 24 16:40:46 2010 +0200

    Fix a typo in the show license code

diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index 51e70b1..12312ed 100644
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -1106,7 +1106,7 @@
                 };\
                 MenuItem\
                 {\
-                    ITEM_SHOW_MENU\
+                    ITEM_SHOW_LICENSE\
                 };\
                 MenuItem\
                 {\
commit bd228119d9e99b423279dcc88df149397f432d0c
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Sep 24 13:33:29 2010 +0200

    Replace the "Help Support" menu item by the "License Information" one

diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml
index e9a0f33..b7bcbd5 100644
--- a/framework/uiconfig/startmodule/menubar/menubar.xml
+++ b/framework/uiconfig/startmodule/menubar/menubar.xml
@@ -74,7 +74,7 @@
             <menu:menuitem menu:id=".uno:HelpIndex"/>
             <menu:menuitem menu:id=".uno:ExtendedHelp"/>
             <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:HelpSupport"/>
+            <menu:menuitem menu:id=".uno:ShowLicense"/>
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:About"/>
         </menu:menupopup>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 2efbaaa..e154a5e 100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -4140,9 +4140,9 @@
                     <value xml:lang="en-US">Optio~n Bar</value>
                 </prop>
             </node>
-            <node oor:name=".uno:HelpSupport" oor:op="replace">
+            <node oor:name=".uno:ShowLicense" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Support</value>
+                    <value xml:lang="en-US">License Information...</value>
                 </prop>
             </node>
             <node oor:name=".uno:StatusBarVisible" oor:op="replace">
diff --git a/readlicense_oo/makefile.mk b/readlicense_oo/makefile.mk
index bb6eff9..0568a98 100755
--- a/readlicense_oo/makefile.mk
+++ b/readlicense_oo/makefile.mk
@@ -46,3 +46,7 @@ $(SYSLICDEST)$/LICENSE_en-US : source$/license$/license_en-US.txt
 $(SYSLICDEST)$/LICENSE_en-US.html : source$/license$/license_en-US.html
     @-$(MKDIRHIER) $(SYSLICDEST)
     $(COPY) $< $@
+
+$(SYSLICDEST)$/LICENSE.odt : source$/license$/license.odt
+    @-$(MKDIRHIER) $(SYSLICDEST)
+    $(COPY) $< $@
diff --git a/readlicense_oo/odt/LICENSE.odt b/readlicense_oo/odt/LICENSE.odt
new file mode 100644
index 0000000..e2e383a
Binary files /dev/null and b/readlicense_oo/odt/LICENSE.odt differ
diff --git a/readlicense_oo/odt/makefile.mk b/readlicense_oo/odt/makefile.mk
new file mode 100644
index 0000000..1e68a17
--- /dev/null
+++ b/readlicense_oo/odt/makefile.mk
@@ -0,0 +1,46 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org 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 Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+
+PRJNAME=readlicense_oo
+TARGET=odt
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+# --- Files --------------------------------------------------------
+
+all: $(MISC)$/LICENSE.odt
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+$(MISC)$/LICENSE.odt: LICENSE.odt
+    $(COPY) LICENSE.odt $@
diff --git a/readlicense_oo/prj/build.lst b/readlicense_oo/prj/build.lst
index 987672d..0f484d0 100644
--- a/readlicense_oo/prj/build.lst
+++ b/readlicense_oo/prj/build.lst
@@ -2,5 +2,6 @@ ro  readlicense_oo :    l10n solenv LIBXSLT:libxslt NULL
 ro  readlicense_oo			usr1 - all ro_root NULL
 ro  readlicense_oo\docs\readme			nmake - all ro_readme NULL
 ro  readlicense_oo\html			nmake - all ro_html NULL
+ro  readlicense_oo\odt			nmake - all ro_odt NULL
 ro  readlicense_oo			nmake - all ro_conv NULL
 
diff --git a/readlicense_oo/prj/d.lst b/readlicense_oo/prj/d.lst
index 4c0ab67..2a368be 100644
--- a/readlicense_oo/prj/d.lst
+++ b/readlicense_oo/prj/d.lst
@@ -10,6 +10,8 @@ dos: echo =====================================================================
 # FIXME: is - can you solve this?
 ..\%__SRC%\misc\license\unx\LICENSE* %_DEST%\bin%_EXT%\osl
 ..\%__SRC%\misc\license\unx\LICENSE*.html %_DEST%\bin%_EXT%\osl
+..\%__SRC%\misc\license\unx\LICENSE*.odt %_DEST%\bin%_EXT%\osl
+..\%__SRC%\misc\license\wnt\LICENSE*.odt %_DEST%\bin%_EXT%\osl
 ..\%__SRC%\misc\license\wnt\license*.txt %_DEST%\bin%_EXT%\osl
 ..\%__SRC%\misc\license\wnt\license*.html %_DEST%\bin%_EXT%\osl
 ..\%__SRC%\misc\license\wnt\license*.rtf %_DEST%\bin%_EXT%\osl
@@ -24,6 +26,8 @@ mkdir: %_DEST%\bin%_EXT%\ure
 # Why? It comes from cws_src680_langsupporter.
 ..\%__SRC%\misc\THIRDPARTYLICENSEREADME.html %_DEST%\bin%_EXT%\THIRDPARTYLICENSEREADME.html
 
+..\%__SRC%\misc\LICENSE.odt %_DEST%\bin%_EXT%\LICENSE.odt
+
 dos: echo =====================================================================
 dos: echo Delivering README files
 dos: echo =====================================================================
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index 358e05c..47dfb33 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -124,7 +124,7 @@
 #define SID_HELP_ZOOMOUT					(SID_SFX_START + 418)
 #define SID_HELP_HELPFILEBOX				(SID_SFX_START + 419)
 #define SID_HELP_HELPFILEBOX_SELECTED		(SID_SFX_START + 420)
-#define SID_HELP_SUPPORTPAGE				(SID_SFX_START + 1683)
+#define SID_SHOW_LICENSE					(SID_SFX_START + 1683)
 #define SID_HELP_TUTORIALS					(SID_SFX_START + 1695)
 
 // default-ids for document
diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi
index b80d93e..6b736da 100644
--- a/sfx2/sdi/appslots.sdi
+++ b/sfx2/sdi/appslots.sdi
@@ -167,7 +167,7 @@ interface Application
         ExecMethod = MiscExec_Impl ;
         StateMethod = MiscState_Impl ;
     ]
-    SID_HELP_SUPPORTPAGE
+    SID_SHOW_LICENSE
     [
         ExecMethod = MiscExec_Impl ;
     ]
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 15d6f7b..54e54cb 100755
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -7366,7 +7366,7 @@ SfxVoidItem UpdateConfiguration SID_UPDATE_CONFIG
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem HelpSupport SID_HELP_SUPPORTPAGE
+SfxVoidItem ShowLicense SID_SHOW_LICENSE
 ()
 [
     /* flags: */
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 837f5be..623d92d 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -51,6 +51,8 @@
 #include <com/sun/star/system/SystemShellExecuteFlags.hpp>
 #include <com/sun/star/system/SystemShellExecuteException.hpp>
 
+#include <com/sun/star/frame/XComponentLoader.hpp>
+
 #include <comphelper/processfactory.hxx>
 #include <comphelper/storagehelper.hxx>
 #include "comphelper/configurationhelper.hxx"
@@ -74,6 +76,7 @@
 #include <vcl/help.hxx>
 #include <vcl/stdtext.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <osl/file.hxx>
 
 #include <unotools/pathoptions.hxx>
 #include <unotools/moduleoptions.hxx>
@@ -158,6 +161,23 @@ long QuitAgain_Impl( void* pObj, void* pArg )
     return 0;
 }
 
+namespace {
+  sal_Bool checkURL( const char *pName, rtl::OUString &rURL )
+    {
+        using namespace osl;
+        DirectoryItem aDirItem;
+
+        rURL = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/") );
+        rURL += rtl::OUString::createFromAscii( pName );
+        rtl::Bootstrap::expandMacros( rURL );
+
+        if (rURL.getLength() != 0)
+            return DirectoryItem::get( rURL, aDirItem ) == DirectoryItem::E_None;
+        else
+            return sal_False;
+    }
+}
+
 void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
 {
     DBG_MEMTEST();
@@ -340,26 +360,35 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
             break;
         }
 
+        case SID_SHOW_LICENSE:
+        {
+            try {
+              Reference < XComponentLoader > xLoader( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), UNO_QUERY );
+              Sequence < com::sun::star::beans::PropertyValue > args(2);
+              args[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ViewOnly"));
+              args[0].Value <<= sal_True;
+              args[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly"));
+              args[1].Value <<= sal_True;
+
+              rtl::OUString aURL;
+              if ( checkURL ( "LICENSE.odt", aURL ) ||
+                   checkURL ( "LICENSE.html", aURL ) ||
+                   checkURL ( "LICENSE", aURL ) ) {
+                  xLoader->loadComponentFromURL( aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_blank")), 0, args );
+              }
+            } catch (const ::com::sun::star::uno::Exception &) {
+            }
+            break;
+        }
+
         // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
         case SID_HELPINDEX:
-        case SID_HELP_SUPPORTPAGE:
         {
             Help* pHelp = Application::GetHelp();
             if ( pHelp )
             {
-                ULONG nHelpId = ( rReq.GetSlot() == SID_HELP_SUPPORTPAGE ) ? 66056 : 0;
-                if ( 66056 == nHelpId )
-                {
-                    // show Support page with new URL
-                    String sHelpURL = SfxHelp::CreateHelpURL( nHelpId, String() );
-                    String sParams = sHelpURL.Copy( sHelpURL.Search( '?' ) );
-                    sHelpURL = String::CreateFromAscii("vnd.sun.star.help://shared/text/shared/05/00000001.xhp");
-                    sHelpURL += sParams;
-                    sHelpURL += String::CreateFromAscii("&UseDB=no");
-                    pHelp->Start( sHelpURL, NULL );
-                }
-                else
-                    pHelp->Start( nHelpId, NULL ); // show start page
+                ULONG nHelpId =  0;
+                pHelp->Start( nHelpId, NULL ); // show start page
                 bDone = TRUE;
             }
             break;
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index 2a3c5c4..51e70b1 100644
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -1049,11 +1049,11 @@
     HelpID = SID_HELPBALLOONS ; \
     Text [ en-US ] = "~Extended Tips" ; \
     
-#define ITEM_HELP_SUPPORTPAGE \
-    Identifier = SID_HELP_SUPPORTPAGE ; \
-    Command = ".uno:HelpSupport" ; \
-    HelpID = SID_HELP_SUPPORTPAGE ; \
-    Text [ en-US ] = "~Support" ;	\
+#define ITEM_SHOW_LICENSE \
+    Identifier = SID_SHOW_LICENSE ; \
+    Command = ".uno:ShowLicense" ; \
+    HelpID = SID_SHOW_LICENSE ; \
+    Text [ en-US ] = "License information..." ;	\
 
 #define ITEM_HELP_ONLINE_REGISTRATION \
     Identifier = SID_ONLINE_REGISTRATION ; \
@@ -1106,7 +1106,7 @@
                 };\
                 MenuItem\
                 {\
-                    ITEM_HELP_SUPPORTPAGE\
+                    ITEM_SHOW_MENU\
                 };\
                 MenuItem\
                 {\
commit 0f0e8248dc92ebd2a620cd32eec78acfeb78cdf9
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Sep 24 09:40:57 2010 +0200

    LibreOffice branding: fixing windows icons

diff --git a/sysui/desktop/icons/database.icns b/sysui/desktop/icons/database.icns
new file mode 100644
index 0000000..115dc85
Binary files /dev/null and b/sysui/desktop/icons/database.icns differ
diff --git a/sysui/desktop/icons/database.ico b/sysui/desktop/icons/database.ico
new file mode 100755
index 0000000..e2377f4
Binary files /dev/null and b/sysui/desktop/icons/database.ico differ
diff --git a/sysui/desktop/icons/drawing-template.ico b/sysui/desktop/icons/drawing-template.ico
new file mode 100755
index 0000000..2d3a088
Binary files /dev/null and b/sysui/desktop/icons/drawing-template.ico differ
diff --git a/sysui/desktop/icons/drawing.ico b/sysui/desktop/icons/drawing.ico
new file mode 100755
index 0000000..2d3a088
Binary files /dev/null and b/sysui/desktop/icons/drawing.ico differ
diff --git a/sysui/desktop/icons/empty-document.ico b/sysui/desktop/icons/empty-document.ico
new file mode 100644
index 0000000..bd3aa12
Binary files /dev/null and b/sysui/desktop/icons/empty-document.ico differ
diff --git a/sysui/desktop/icons/empty-template.ico b/sysui/desktop/icons/empty-template.ico
new file mode 100644
index 0000000..b68f0f1
Binary files /dev/null and b/sysui/desktop/icons/empty-template.ico differ
diff --git a/sysui/desktop/icons/formula.ico b/sysui/desktop/icons/formula.ico
new file mode 100755
index 0000000..6360ec4
Binary files /dev/null and b/sysui/desktop/icons/formula.ico differ
diff --git a/sysui/desktop/icons/makefile.mk b/sysui/desktop/icons/makefile.mk
index 5133ce1..ac32cdb 100644
--- a/sysui/desktop/icons/makefile.mk
+++ b/sysui/desktop/icons/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -41,6 +37,33 @@ TARGET=icons
 # --- Targets -------------------------------------------------------------
 
 all: \
+    $(MISC)$/oasis-database.ico \
+    $(MISC)$/oasis-drawing-template.ico \
+    $(MISC)$/oasis-drawing.ico \
+    $(MISC)$/oasis-empty-template.ico \
+    $(MISC)$/oasis-empty-document.ico \
+    $(MISC)$/oasis-formula.ico \
+    $(MISC)$/oasis-master-document.ico \
+    $(MISC)$/oasis-presentation-template.ico \
+    $(MISC)$/oasis-presentation.ico \
+    $(MISC)$/oasis-spreadsheet-template.ico \
+    $(MISC)$/oasis-spreadsheet.ico \
+    $(MISC)$/oasis-text-template.ico \
+    $(MISC)$/oasis-text.ico \
+    $(MISC)$/oasis-web-template.ico \
+    $(MISC)$/database.ico \
+    $(MISC)$/drawing-template.ico \
+    $(MISC)$/drawing.ico \
+    $(MISC)$/empty-template.ico \
+    $(MISC)$/empty-document.ico \
+    $(MISC)$/formula.ico \
+    $(MISC)$/master-document.ico \
+    $(MISC)$/presentation-template.ico \
+    $(MISC)$/presentation.ico \
+    $(MISC)$/spreadsheet-template.ico \
+    $(MISC)$/spreadsheet.ico \
+    $(MISC)$/text-template.ico \
+    $(MISC)$/text.ico \
     $(MISC)$/ooo-base-app.ico \
     $(MISC)$/ooo-base-doc.ico \
     $(MISC)$/ooo-calc-app.ico \
@@ -91,6 +114,7 @@ all: \
     $(MISC)$/ooo3_math_doc.ico \
     $(MISC)$/ooo3_writer_tem.ico \
     $(MISC)$/ooo3_empty_tem.ico \
+    $(MISC)$/ooo3_open.ico \
     $(MISC)$/ooo11-base-doc.ico \
     $(MISC)$/ooo11-calc-doc.ico \
     $(MISC)$/ooo11-calc-tem.ico \
@@ -153,6 +177,7 @@ all: \
     $(MISC)$/so9_chart_doc.ico \
     $(MISC)$/so9_writer_app.ico \
     $(MISC)$/so9_draw_app.ico \
+    $(MISC)$/so9_open.ico \
     $(MISC)$/so7-base-doc.ico \
     $(MISC)$/so7-calc-doc.ico \
     $(MISC)$/so7-calc-tem.ico \
diff --git a/sysui/desktop/icons/master-document.ico b/sysui/desktop/icons/master-document.ico
new file mode 100755
index 0000000..e2377f4
Binary files /dev/null and b/sysui/desktop/icons/master-document.ico differ
diff --git a/sysui/desktop/icons/oasis-database.ico b/sysui/desktop/icons/oasis-database.ico
new file mode 100644
index 0000000..87c58e6
Binary files /dev/null and b/sysui/desktop/icons/oasis-database.ico differ
diff --git a/sysui/desktop/icons/oasis-drawing-template.ico b/sysui/desktop/icons/oasis-drawing-template.ico
new file mode 100644
index 0000000..4a55c99
Binary files /dev/null and b/sysui/desktop/icons/oasis-drawing-template.ico differ
diff --git a/sysui/desktop/icons/oasis-drawing.ico b/sysui/desktop/icons/oasis-drawing.ico
new file mode 100644
index 0000000..47ed3ef
Binary files /dev/null and b/sysui/desktop/icons/oasis-drawing.ico differ
diff --git a/sysui/desktop/icons/oasis-empty-document.icns b/sysui/desktop/icons/oasis-empty-document.icns
new file mode 100644
index 0000000..c529703
Binary files /dev/null and b/sysui/desktop/icons/oasis-empty-document.icns differ
diff --git a/sysui/desktop/icons/oasis-empty-document.ico b/sysui/desktop/icons/oasis-empty-document.ico
new file mode 100644
index 0000000..67e3c34
Binary files /dev/null and b/sysui/desktop/icons/oasis-empty-document.ico differ
diff --git a/sysui/desktop/icons/oasis-empty-template.icns b/sysui/desktop/icons/oasis-empty-template.icns
new file mode 100644
index 0000000..ee6d299
Binary files /dev/null and b/sysui/desktop/icons/oasis-empty-template.icns differ
diff --git a/sysui/desktop/icons/oasis-empty-template.ico b/sysui/desktop/icons/oasis-empty-template.ico
new file mode 100644
index 0000000..eecd336
Binary files /dev/null and b/sysui/desktop/icons/oasis-empty-template.ico differ
diff --git a/sysui/desktop/icons/oasis-formula.ico b/sysui/desktop/icons/oasis-formula.ico
new file mode 100644
index 0000000..9e349dc
Binary files /dev/null and b/sysui/desktop/icons/oasis-formula.ico differ
diff --git a/sysui/desktop/icons/oasis-master-document.ico b/sysui/desktop/icons/oasis-master-document.ico
new file mode 100644
index 0000000..c7113f8
Binary files /dev/null and b/sysui/desktop/icons/oasis-master-document.ico differ
diff --git a/sysui/desktop/icons/oasis-presentation-template.ico b/sysui/desktop/icons/oasis-presentation-template.ico
new file mode 100644
index 0000000..0e80d9b
Binary files /dev/null and b/sysui/desktop/icons/oasis-presentation-template.ico differ
diff --git a/sysui/desktop/icons/oasis-presentation.ico b/sysui/desktop/icons/oasis-presentation.ico
new file mode 100644
index 0000000..0e80d9b
Binary files /dev/null and b/sysui/desktop/icons/oasis-presentation.ico differ
diff --git a/sysui/desktop/icons/oasis-spreadsheet-template.ico b/sysui/desktop/icons/oasis-spreadsheet-template.ico
new file mode 100644
index 0000000..2a72a5a
Binary files /dev/null and b/sysui/desktop/icons/oasis-spreadsheet-template.ico differ
diff --git a/sysui/desktop/icons/oasis-spreadsheet.ico b/sysui/desktop/icons/oasis-spreadsheet.ico
new file mode 100644
index 0000000..92741f3
Binary files /dev/null and b/sysui/desktop/icons/oasis-spreadsheet.ico differ
diff --git a/sysui/desktop/icons/oasis-text-template.ico b/sysui/desktop/icons/oasis-text-template.ico
new file mode 100644
index 0000000..f609be1
Binary files /dev/null and b/sysui/desktop/icons/oasis-text-template.ico differ
diff --git a/sysui/desktop/icons/oasis-text.ico b/sysui/desktop/icons/oasis-text.ico
new file mode 100644
index 0000000..1ed299a
Binary files /dev/null and b/sysui/desktop/icons/oasis-text.ico differ
diff --git a/sysui/desktop/icons/oasis-web-template.ico b/sysui/desktop/icons/oasis-web-template.ico
new file mode 100644
index 0000000..eecd336
Binary files /dev/null and b/sysui/desktop/icons/oasis-web-template.ico differ
diff --git a/sysui/desktop/icons/ooo3_open.ico b/sysui/desktop/icons/ooo3_open.ico
new file mode 100644
index 0000000..78987ae
Binary files /dev/null and b/sysui/desktop/icons/ooo3_open.ico differ
diff --git a/sysui/desktop/icons/presentation-template.ico b/sysui/desktop/icons/presentation-template.ico
new file mode 100755
index 0000000..173db79
Binary files /dev/null and b/sysui/desktop/icons/presentation-template.ico differ
diff --git a/sysui/desktop/icons/presentation.ico b/sysui/desktop/icons/presentation.ico
new file mode 100755
index 0000000..173db79
Binary files /dev/null and b/sysui/desktop/icons/presentation.ico differ
diff --git a/sysui/desktop/icons/so9_open.ico b/sysui/desktop/icons/so9_open.ico
new file mode 100755
index 0000000..90f193d
Binary files /dev/null and b/sysui/desktop/icons/so9_open.ico differ
diff --git a/sysui/desktop/icons/spreadsheet-template.ico b/sysui/desktop/icons/spreadsheet-template.ico
new file mode 100755
index 0000000..bce2ae3
Binary files /dev/null and b/sysui/desktop/icons/spreadsheet-template.ico differ
diff --git a/sysui/desktop/icons/spreadsheet.ico b/sysui/desktop/icons/spreadsheet.ico
new file mode 100755
index 0000000..bce2ae3
Binary files /dev/null and b/sysui/desktop/icons/spreadsheet.ico differ
diff --git a/sysui/desktop/icons/text-template.ico b/sysui/desktop/icons/text-template.ico
new file mode 100755
index 0000000..745a58b
Binary files /dev/null and b/sysui/desktop/icons/text-template.ico differ
diff --git a/sysui/desktop/icons/text.ico b/sysui/desktop/icons/text.ico
new file mode 100755
index 0000000..745a58b
Binary files /dev/null and b/sysui/desktop/icons/text.ico differ
commit bdf93c42208aeb76eaa1edd72d150e253df6da14
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Sep 23 11:05:26 2010 +0200

    LibreOffice branding: make printeradmin desktop file work too

diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index ebe1326..1ed7da9 100644
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -99,6 +99,7 @@ cp printeradmin.sh ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
 chmod 0755 ${DESTDIR}/usr/bin/${PREFIX} ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
 
 ln -sf /usr/bin/${PREFIX} ${DESTDIR}/usr/bin/libreoffice
+ln -sf /usr/bin/${PREFIX}-printeradmin ${DESTDIR}/usr/bin/libreoffice-printeradmin
 
 mkdir -p ${DESTDIR}/usr/share/mime/packages
 cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/libreoffice.xml
commit 5a369aacc9b5d304bd646e158421a336ec762237
Author: Thorsten Behrens <thb at openoffice.org>
Date:   Thu Sep 23 01:48:02 2010 +0200

    Reverting the icon change / decoloring

diff --git a/sysui/desktop/icons/database.icns b/sysui/desktop/icons/database.icns
deleted file mode 100644
index 115dc85..0000000
Binary files a/sysui/desktop/icons/database.icns and /dev/null differ
diff --git a/sysui/desktop/icons/database.ico b/sysui/desktop/icons/database.ico
deleted file mode 100644
index 171d39b..0000000
Binary files a/sysui/desktop/icons/database.ico and /dev/null differ
diff --git a/sysui/desktop/icons/drawing-template.icns b/sysui/desktop/icons/drawing-template.icns
index 4074845..359164f 100644
Binary files a/sysui/desktop/icons/drawing-template.icns and b/sysui/desktop/icons/drawing-template.icns differ
diff --git a/sysui/desktop/icons/drawing-template.ico b/sysui/desktop/icons/drawing-template.ico
deleted file mode 100644
index 5b5a74e..0000000
Binary files a/sysui/desktop/icons/drawing-template.ico and /dev/null differ
diff --git a/sysui/desktop/icons/drawing.icns b/sysui/desktop/icons/drawing.icns
index 5322625..81777c7 100644
Binary files a/sysui/desktop/icons/drawing.icns and b/sysui/desktop/icons/drawing.icns differ
diff --git a/sysui/desktop/icons/drawing.ico b/sysui/desktop/icons/drawing.ico
deleted file mode 100644
index 1065490..0000000
Binary files a/sysui/desktop/icons/drawing.ico and /dev/null differ
diff --git a/sysui/desktop/icons/empty-document.icns b/sysui/desktop/icons/empty-document.icns
index ab676f6..18d1133 100644
Binary files a/sysui/desktop/icons/empty-document.icns and b/sysui/desktop/icons/empty-document.icns differ
diff --git a/sysui/desktop/icons/empty-document.ico b/sysui/desktop/icons/empty-document.ico
deleted file mode 100644
index 4115c30..0000000
Binary files a/sysui/desktop/icons/empty-document.ico and /dev/null differ
diff --git a/sysui/desktop/icons/empty-template.icns b/sysui/desktop/icons/empty-template.icns
index 50e63b9..034d30b 100644
Binary files a/sysui/desktop/icons/empty-template.icns and b/sysui/desktop/icons/empty-template.icns differ
diff --git a/sysui/desktop/icons/empty-template.ico b/sysui/desktop/icons/empty-template.ico
deleted file mode 100644
index dec1476..0000000
Binary files a/sysui/desktop/icons/empty-template.ico and /dev/null differ
diff --git a/sysui/desktop/icons/formula.icns b/sysui/desktop/icons/formula.icns
index 4620688..61cd00a 100644
Binary files a/sysui/desktop/icons/formula.icns and b/sysui/desktop/icons/formula.icns differ
diff --git a/sysui/desktop/icons/formula.ico b/sysui/desktop/icons/formula.ico
deleted file mode 100644
index e06aef1..0000000
Binary files a/sysui/desktop/icons/formula.ico and /dev/null differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/base.png b/sysui/desktop/icons/hicolor/128x128/apps/base.png
index 398c2f0..42b0276 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/apps/base.png and b/sysui/desktop/icons/hicolor/128x128/apps/base.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/calc.png b/sysui/desktop/icons/hicolor/128x128/apps/calc.png
index 8156308..368fb03 100644
Binary files a/sysui/desktop/icons/hicolor/128x128/apps/calc.png and b/sysui/desktop/icons/hicolor/128x128/apps/calc.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/draw.png b/sysui/desktop/icons/hicolor/128x128/apps/draw.png
index 3f71b25..72b67c8 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/apps/draw.png and b/sysui/desktop/icons/hicolor/128x128/apps/draw.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/impress.png b/sysui/desktop/icons/hicolor/128x128/apps/impress.png
index b62b449..32ad785 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/apps/impress.png and b/sysui/desktop/icons/hicolor/128x128/apps/impress.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/main.png b/sysui/desktop/icons/hicolor/128x128/apps/main.png
index 1b51a60..fd68a10 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/apps/main.png and b/sysui/desktop/icons/hicolor/128x128/apps/main.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/math.png b/sysui/desktop/icons/hicolor/128x128/apps/math.png
index d37c98a..79e71ce 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/apps/math.png and b/sysui/desktop/icons/hicolor/128x128/apps/math.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png b/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png
index 1b51a60..b009ee2 100644
Binary files a/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png and b/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/writer.png b/sysui/desktop/icons/hicolor/128x128/apps/writer.png
index b991a6d..0d057fa 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/apps/writer.png and b/sysui/desktop/icons/hicolor/128x128/apps/writer.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/database.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/database.png
deleted file mode 100644
index 93b8e60..0000000
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/database.png and /dev/null differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/drawing-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/drawing-template.png
deleted file mode 100644
index 15b80e0..0000000
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/drawing-template.png and /dev/null differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/drawing.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/drawing.png
deleted file mode 100644
index 9d47f74..0000000
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/drawing.png and /dev/null differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/formula.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/formula.png
deleted file mode 100644
index 184dd0c..0000000
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/formula.png and /dev/null differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/master-document.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/master-document.png
deleted file mode 100644
index acf19ff..0000000
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/master-document.png and /dev/null differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-database.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-database.png
index f95bbf1..1429d82 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-database.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-database.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing-template.png
index 630a51e..4fdde3c 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing-template.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing-template.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing.png
index 82ac8d1..7272482 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-formula.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-formula.png
index c838eaa..9e4c72e 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-formula.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-formula.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-master-document.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-master-document.png
index 640e2d9..6f191e2 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-master-document.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-master-document.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation-template.png
index c495480..bf8229c 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation-template.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation-template.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation.png
index 1d5aced..2b3a5bb 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.png
index 01781db..18c00ad 100644
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.png
index bc46714..ca48052 100644
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text-template.png
index 569bd51..ef5b5dd 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text-template.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text-template.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text.png
index b45244a..178d4e2 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-web-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-web-template.png
index 8e6c458..7edd66d 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-web-template.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-web-template.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/presentation-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/presentation-template.png
deleted file mode 100644
index c8a3813..0000000
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/presentation-template.png and /dev/null differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/presentation.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/presentation.png
deleted file mode 100644
index 2a0552e..0000000
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/presentation.png and /dev/null differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/spreadsheet-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/spreadsheet-template.png
deleted file mode 100644
index cc7aa51..0000000
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/spreadsheet-template.png and /dev/null differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/spreadsheet.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/spreadsheet.png
deleted file mode 100644
index c701fd7..0000000
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/spreadsheet.png and /dev/null differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/text-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/text-template.png
deleted file mode 100644
index 652c1ce..0000000
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/text-template.png and /dev/null differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/text.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/text.png
deleted file mode 100644
index f881aca..0000000
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/text.png and /dev/null differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/base.png b/sysui/desktop/icons/hicolor/16x16/apps/base.png
index 57a4477..3a08ee1 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/apps/base.png and b/sysui/desktop/icons/hicolor/16x16/apps/base.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/calc.png b/sysui/desktop/icons/hicolor/16x16/apps/calc.png
index 78f923d..2dc5407 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/apps/calc.png and b/sysui/desktop/icons/hicolor/16x16/apps/calc.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/draw.png b/sysui/desktop/icons/hicolor/16x16/apps/draw.png
index 7779dd4..afc0370 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/apps/draw.png and b/sysui/desktop/icons/hicolor/16x16/apps/draw.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/impress.png b/sysui/desktop/icons/hicolor/16x16/apps/impress.png
index ff07597..f1957da 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/apps/impress.png and b/sysui/desktop/icons/hicolor/16x16/apps/impress.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/main.png b/sysui/desktop/icons/hicolor/16x16/apps/main.png
deleted file mode 100755
index 3aa8f08..0000000
Binary files a/sysui/desktop/icons/hicolor/16x16/apps/main.png and /dev/null differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/math.png b/sysui/desktop/icons/hicolor/16x16/apps/math.png
index 10c71e6..de14882 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/apps/math.png and b/sysui/desktop/icons/hicolor/16x16/apps/math.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png b/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png
old mode 100755
new mode 100644
index 399076c..4e8eb0e
Binary files a/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png and b/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png b/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png
index 3aa8f08..c81fc95 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png and b/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/writer.png b/sysui/desktop/icons/hicolor/16x16/apps/writer.png
index 2b82110..8304269 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/apps/writer.png and b/sysui/desktop/icons/hicolor/16x16/apps/writer.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/database.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/database.png
index fb32e00..bbf4855 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/database.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/database.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing-template.png
index f045190..74770d5 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing-template.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing-template.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing.png
index 3bd7b7d..3030379 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/formula.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/formula.png
index e7e9587..3eb7f88 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/formula.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/formula.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/master-document.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/master-document.png
index e442a0c..c424e4f 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/master-document.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/master-document.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-database.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-database.png
index e4ae285..2f2d56d 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-database.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-database.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing-template.png
index eaad54f..94f4ac9 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing-template.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing-template.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing.png
index 3d66cc9..d65439a 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png
index 4cefbb6..9c628ce 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-master-document.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-master-document.png
index 12aab4a..137778d 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-master-document.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-master-document.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation-template.png
index 9f28183..3153d8e 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation-template.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation-template.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation.png
index 46942cb..c642127 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.png
index 4781bfc..689bb5a 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.png
index abc38d4..f51a29a 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text-template.png
index 9836814..1c20ed0 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text-template.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text-template.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.png
index 06c1f30..8b095bf 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-web-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-web-template.png
index 01c04a0..795d926 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-web-template.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-web-template.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation-template.png
index df1d529..bb20d13 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation-template.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation-template.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation.png
index 6803ae4..b82ddf7 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet-template.png
index 5be785e..3546349 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet-template.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet-template.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet.png
index 46c7224..df164ff 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/text-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/text-template.png
index 2827f29..4d89528 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/text-template.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/text-template.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/text.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/text.png
index c0d1cd3..6ff2517 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/text.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/text.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/base.png b/sysui/desktop/icons/hicolor/32x32/apps/base.png
index f4772d7..f30fe4a 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/apps/base.png and b/sysui/desktop/icons/hicolor/32x32/apps/base.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/calc.png b/sysui/desktop/icons/hicolor/32x32/apps/calc.png
index a1eae7b..4e7e423 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/apps/calc.png and b/sysui/desktop/icons/hicolor/32x32/apps/calc.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/draw.png b/sysui/desktop/icons/hicolor/32x32/apps/draw.png
index 4dc928a..f34faf5 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/apps/draw.png and b/sysui/desktop/icons/hicolor/32x32/apps/draw.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/impress.png b/sysui/desktop/icons/hicolor/32x32/apps/impress.png
index 9abced7..7b8ec64 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/apps/impress.png and b/sysui/desktop/icons/hicolor/32x32/apps/impress.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/main.png b/sysui/desktop/icons/hicolor/32x32/apps/main.png
deleted file mode 100755
index 296c6f4..0000000
Binary files a/sysui/desktop/icons/hicolor/32x32/apps/main.png and /dev/null differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/math.png b/sysui/desktop/icons/hicolor/32x32/apps/math.png
index 146a7de..6c3c3b6 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/apps/math.png and b/sysui/desktop/icons/hicolor/32x32/apps/math.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png b/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png
old mode 100755
new mode 100644
index b09999c..2c7a0c0
Binary files a/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png and b/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png b/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png
index 296c6f4..22bdd4a 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png and b/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/writer.png b/sysui/desktop/icons/hicolor/32x32/apps/writer.png
index 97b9d3f..8a59432 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/apps/writer.png and b/sysui/desktop/icons/hicolor/32x32/apps/writer.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/database.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/database.png
index 6e0a4b8..709903d 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/database.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/database.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing-template.png
index a341632..76e5abd 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing-template.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing-template.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing.png
index 4abe5c0..380c60a 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/formula.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/formula.png
index d989593..37306ac 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/formula.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/formula.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/master-document.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/master-document.png
index d4b033f..1f3e799 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/master-document.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/master-document.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-database.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-database.png
index 461bdf3..ddfcd7d 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-database.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-database.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing-template.png
index cdc2f2d..e742adc 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing-template.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing-template.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing.png
index 55dda21..8d78d91 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-formula.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-formula.png
index 6b8f2f7..302c7ab 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-formula.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-formula.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-master-document.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-master-document.png
index 234bac4..fc03240 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-master-document.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-master-document.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation-template.png
index 0125160..03c96f8 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation-template.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation-template.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation.png
index fedeb06..465583b 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.png
index 9d63063..383906a 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.png
index 020d95b..67da85c 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text-template.png
index 983b39e..feb935c 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text-template.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text-template.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.png
index ac350cb..571e6a0 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-web-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-web-template.png
index 8e906f8..e3bd788 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-web-template.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-web-template.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation-template.png
index 5163f44..0edabbc 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation-template.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation-template.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation.png
index 730f86f..0eee116 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet-template.png
index d81cd27..158a63a 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet-template.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet-template.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet.png
index dc9bd08..f7352ab 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/text-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/text-template.png
index 7c738c2..cfba261 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/text-template.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/text-template.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/text.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/text.png
index 1454b20..77f87e7 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/text.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/text.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/base.png b/sysui/desktop/icons/hicolor/48x48/apps/base.png
index 382ad3e..d68e712 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/apps/base.png and b/sysui/desktop/icons/hicolor/48x48/apps/base.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/calc.png b/sysui/desktop/icons/hicolor/48x48/apps/calc.png
index d94aae3..33690ba 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/apps/calc.png and b/sysui/desktop/icons/hicolor/48x48/apps/calc.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/draw.png b/sysui/desktop/icons/hicolor/48x48/apps/draw.png
index 1a2d252..2acb572 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/apps/draw.png and b/sysui/desktop/icons/hicolor/48x48/apps/draw.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/impress.png b/sysui/desktop/icons/hicolor/48x48/apps/impress.png
index 35d3b25..a46324e 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/apps/impress.png and b/sysui/desktop/icons/hicolor/48x48/apps/impress.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/main.png b/sysui/desktop/icons/hicolor/48x48/apps/main.png
deleted file mode 100755
index 86bcf59..0000000
Binary files a/sysui/desktop/icons/hicolor/48x48/apps/main.png and /dev/null differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/math.png b/sysui/desktop/icons/hicolor/48x48/apps/math.png
index 3572d76..691ef83 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/apps/math.png and b/sysui/desktop/icons/hicolor/48x48/apps/math.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png b/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png
old mode 100755
new mode 100644
index a11cbe5..41971c9
Binary files a/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png and b/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png b/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png
index 86bcf59..f67dc97 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png and b/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/writer.png b/sysui/desktop/icons/hicolor/48x48/apps/writer.png
index 8041a20..9ae7402 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/apps/writer.png and b/sysui/desktop/icons/hicolor/48x48/apps/writer.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/database.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/database.png
index b385ed9..224943b 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/database.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/database.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing-template.png
index b7da9bf..043dd5d 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing-template.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing-template.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing.png
index 85499fd..8857034 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/formula.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/formula.png
index bcc61b4..45f6d91 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/formula.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/formula.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/master-document.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/master-document.png
index 7a7b869..191a619 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/master-document.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/master-document.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-database.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-database.png
index 77e6849..2c2ffb8 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-database.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-database.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png
index 8cb4dd3..655a938 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing.png
index 258b3b2..c1bbdc4 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-formula.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-formula.png
index f6508de..fbdede2 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-formula.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-formula.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-master-document.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-master-document.png
index 1923fc9..d06b5ca 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-master-document.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-master-document.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation-template.png
index 00d3113..f77c9c6 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation-template.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation-template.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation.png
index 635953e..7336f35 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.png
index 7c4beda..850250c 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.png
index 4c407a0..6f6328c 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text-template.png
index 64b8694..ac0d373 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text-template.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text-template.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text.png
index 0c04210..8c2b714 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-web-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-web-template.png
index 0ff92ec..a7cf8d0 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-web-template.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-web-template.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation-template.png
index d9651bf..2193c98 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation-template.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation-template.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation.png
index e058d25..bd59fbb 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet-template.png
index 5d5e46e..34c60c2 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet-template.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet-template.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet.png
index c352966..6868f57 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/text-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/text-template.png
index ad51297..52a28fb 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/text-template.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/text-template.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/text.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/text.png
index 2a17070..7ead079 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/text.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/text.png differ
diff --git a/sysui/desktop/icons/main.icns b/sysui/desktop/icons/main.icns
old mode 100755
new mode 100644
index 8357c09..c7ee5d7
Binary files a/sysui/desktop/icons/main.icns and b/sysui/desktop/icons/main.icns differ
diff --git a/sysui/desktop/icons/makefile.mk b/sysui/desktop/icons/makefile.mk
index ac32cdb..5133ce1 100644
--- a/sysui/desktop/icons/makefile.mk
+++ b/sysui/desktop/icons/makefile.mk
@@ -2,10 +2,14 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.8 $
+#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,33 +41,6 @@ TARGET=icons
 # --- Targets -------------------------------------------------------------
 
 all: \
-    $(MISC)$/oasis-database.ico \
-    $(MISC)$/oasis-drawing-template.ico \
-    $(MISC)$/oasis-drawing.ico \
-    $(MISC)$/oasis-empty-template.ico \
-    $(MISC)$/oasis-empty-document.ico \
-    $(MISC)$/oasis-formula.ico \
-    $(MISC)$/oasis-master-document.ico \
-    $(MISC)$/oasis-presentation-template.ico \
-    $(MISC)$/oasis-presentation.ico \
-    $(MISC)$/oasis-spreadsheet-template.ico \
-    $(MISC)$/oasis-spreadsheet.ico \
-    $(MISC)$/oasis-text-template.ico \
-    $(MISC)$/oasis-text.ico \
-    $(MISC)$/oasis-web-template.ico \
-    $(MISC)$/database.ico \
-    $(MISC)$/drawing-template.ico \
-    $(MISC)$/drawing.ico \
-    $(MISC)$/empty-template.ico \
-    $(MISC)$/empty-document.ico \
-    $(MISC)$/formula.ico \
-    $(MISC)$/master-document.ico \
-    $(MISC)$/presentation-template.ico \
-    $(MISC)$/presentation.ico \
-    $(MISC)$/spreadsheet-template.ico \
-    $(MISC)$/spreadsheet.ico \
-    $(MISC)$/text-template.ico \
-    $(MISC)$/text.ico \
     $(MISC)$/ooo-base-app.ico \
     $(MISC)$/ooo-base-doc.ico \
     $(MISC)$/ooo-calc-app.ico \
@@ -114,7 +91,6 @@ all: \
     $(MISC)$/ooo3_math_doc.ico \
     $(MISC)$/ooo3_writer_tem.ico \
     $(MISC)$/ooo3_empty_tem.ico \
-    $(MISC)$/ooo3_open.ico \
     $(MISC)$/ooo11-base-doc.ico \
     $(MISC)$/ooo11-calc-doc.ico \
     $(MISC)$/ooo11-calc-tem.ico \
@@ -177,7 +153,6 @@ all: \
     $(MISC)$/so9_chart_doc.ico \
     $(MISC)$/so9_writer_app.ico \
     $(MISC)$/so9_draw_app.ico \
-    $(MISC)$/so9_open.ico \
     $(MISC)$/so7-base-doc.ico \
     $(MISC)$/so7-calc-doc.ico \
     $(MISC)$/so7-calc-tem.ico \
diff --git a/sysui/desktop/icons/master-document.icns b/sysui/desktop/icons/master-document.icns
index 33fdae3..2089b9a 100644
Binary files a/sysui/desktop/icons/master-document.icns and b/sysui/desktop/icons/master-document.icns differ
diff --git a/sysui/desktop/icons/master-document.ico b/sysui/desktop/icons/master-document.ico
deleted file mode 100644
index 2c581f5..0000000
Binary files a/sysui/desktop/icons/master-document.ico and /dev/null differ
diff --git a/sysui/desktop/icons/oasis-database.icns b/sysui/desktop/icons/oasis-database.icns
index 4d70286..f64c6d2 100644
Binary files a/sysui/desktop/icons/oasis-database.icns and b/sysui/desktop/icons/oasis-database.icns differ
diff --git a/sysui/desktop/icons/oasis-database.ico b/sysui/desktop/icons/oasis-database.ico
deleted file mode 100644
index 3157568..0000000
Binary files a/sysui/desktop/icons/oasis-database.ico and /dev/null differ
diff --git a/sysui/desktop/icons/oasis-drawing-template.icns b/sysui/desktop/icons/oasis-drawing-template.icns
index dcb55db..bb357ba 100644
Binary files a/sysui/desktop/icons/oasis-drawing-template.icns and b/sysui/desktop/icons/oasis-drawing-template.icns differ
diff --git a/sysui/desktop/icons/oasis-drawing-template.ico b/sysui/desktop/icons/oasis-drawing-template.ico
deleted file mode 100644
index f98a2d6..0000000
Binary files a/sysui/desktop/icons/oasis-drawing-template.ico and /dev/null differ
diff --git a/sysui/desktop/icons/oasis-drawing.icns b/sysui/desktop/icons/oasis-drawing.icns
index 3802af5..80adc9f 100644
Binary files a/sysui/desktop/icons/oasis-drawing.icns and b/sysui/desktop/icons/oasis-drawing.icns differ
diff --git a/sysui/desktop/icons/oasis-drawing.ico b/sysui/desktop/icons/oasis-drawing.ico
deleted file mode 100644
index b24f2da..0000000
Binary files a/sysui/desktop/icons/oasis-drawing.ico and /dev/null differ
diff --git a/sysui/desktop/icons/oasis-empty-document.icns b/sysui/desktop/icons/oasis-empty-document.icns
deleted file mode 100644
index c529703..0000000
Binary files a/sysui/desktop/icons/oasis-empty-document.icns and /dev/null differ
diff --git a/sysui/desktop/icons/oasis-empty-document.ico b/sysui/desktop/icons/oasis-empty-document.ico
deleted file mode 100644
index a12b54c..0000000
Binary files a/sysui/desktop/icons/oasis-empty-document.ico and /dev/null differ
diff --git a/sysui/desktop/icons/oasis-empty-template.icns b/sysui/desktop/icons/oasis-empty-template.icns
deleted file mode 100644
index ee6d299..0000000
Binary files a/sysui/desktop/icons/oasis-empty-template.icns and /dev/null differ
diff --git a/sysui/desktop/icons/oasis-empty-template.ico b/sysui/desktop/icons/oasis-empty-template.ico
deleted file mode 100644
index 63ac9f3..0000000
Binary files a/sysui/desktop/icons/oasis-empty-template.ico and /dev/null differ
diff --git a/sysui/desktop/icons/oasis-formula.icns b/sysui/desktop/icons/oasis-formula.icns
index 657ea29..a7bded1 100644
Binary files a/sysui/desktop/icons/oasis-formula.icns and b/sysui/desktop/icons/oasis-formula.icns differ
diff --git a/sysui/desktop/icons/oasis-formula.ico b/sysui/desktop/icons/oasis-formula.ico
deleted file mode 100644
index 8ba7383..0000000
Binary files a/sysui/desktop/icons/oasis-formula.ico and /dev/null differ
diff --git a/sysui/desktop/icons/oasis-master-document.icns b/sysui/desktop/icons/oasis-master-document.icns
index c39cb89..1891c12 100644
Binary files a/sysui/desktop/icons/oasis-master-document.icns and b/sysui/desktop/icons/oasis-master-document.icns differ
diff --git a/sysui/desktop/icons/oasis-master-document.ico b/sysui/desktop/icons/oasis-master-document.ico
deleted file mode 100644
index 2104eaf..0000000
Binary files a/sysui/desktop/icons/oasis-master-document.ico and /dev/null differ
diff --git a/sysui/desktop/icons/oasis-presentation-template.icns b/sysui/desktop/icons/oasis-presentation-template.icns
index 57455ad..337df2f 100644
Binary files a/sysui/desktop/icons/oasis-presentation-template.icns and b/sysui/desktop/icons/oasis-presentation-template.icns differ
diff --git a/sysui/desktop/icons/oasis-presentation-template.ico b/sysui/desktop/icons/oasis-presentation-template.ico
deleted file mode 100644
index ef561b8..0000000
Binary files a/sysui/desktop/icons/oasis-presentation-template.ico and /dev/null differ
diff --git a/sysui/desktop/icons/oasis-presentation.icns b/sysui/desktop/icons/oasis-presentation.icns
index cf768ac..4b9ba42 100644
Binary files a/sysui/desktop/icons/oasis-presentation.icns and b/sysui/desktop/icons/oasis-presentation.icns differ
diff --git a/sysui/desktop/icons/oasis-presentation.ico b/sysui/desktop/icons/oasis-presentation.ico
deleted file mode 100644
index 6f2c160..0000000
Binary files a/sysui/desktop/icons/oasis-presentation.ico and /dev/null differ
diff --git a/sysui/desktop/icons/oasis-spreadsheet-template.icns b/sysui/desktop/icons/oasis-spreadsheet-template.icns
index 8235e52..2bae7e3 100644
Binary files a/sysui/desktop/icons/oasis-spreadsheet-template.icns and b/sysui/desktop/icons/oasis-spreadsheet-template.icns differ
diff --git a/sysui/desktop/icons/oasis-spreadsheet-template.ico b/sysui/desktop/icons/oasis-spreadsheet-template.ico
deleted file mode 100644
index 1124d9f..0000000
Binary files a/sysui/desktop/icons/oasis-spreadsheet-template.ico and /dev/null differ
diff --git a/sysui/desktop/icons/oasis-spreadsheet.icns b/sysui/desktop/icons/oasis-spreadsheet.icns
index 5facf50..69b46c2 100644
Binary files a/sysui/desktop/icons/oasis-spreadsheet.icns and b/sysui/desktop/icons/oasis-spreadsheet.icns differ
diff --git a/sysui/desktop/icons/oasis-spreadsheet.ico b/sysui/desktop/icons/oasis-spreadsheet.ico
deleted file mode 100644
index 160ab0c..0000000
Binary files a/sysui/desktop/icons/oasis-spreadsheet.ico and /dev/null differ
diff --git a/sysui/desktop/icons/oasis-text-template.icns b/sysui/desktop/icons/oasis-text-template.icns
index 0f0fe3f..1986a32 100644
Binary files a/sysui/desktop/icons/oasis-text-template.icns and b/sysui/desktop/icons/oasis-text-template.icns differ
diff --git a/sysui/desktop/icons/oasis-text-template.ico b/sysui/desktop/icons/oasis-text-template.ico
deleted file mode 100644
index 602124f..0000000
Binary files a/sysui/desktop/icons/oasis-text-template.ico and /dev/null differ
diff --git a/sysui/desktop/icons/oasis-text.icns b/sysui/desktop/icons/oasis-text.icns
index 2d031fe..21a44a9 100644
Binary files a/sysui/desktop/icons/oasis-text.icns and b/sysui/desktop/icons/oasis-text.icns differ
diff --git a/sysui/desktop/icons/oasis-text.ico b/sysui/desktop/icons/oasis-text.ico
deleted file mode 100644
index d2bd594..0000000
Binary files a/sysui/desktop/icons/oasis-text.ico and /dev/null differ
diff --git a/sysui/desktop/icons/oasis-web-template.icns b/sysui/desktop/icons/oasis-web-template.icns
index ee6d299..66b0db7 100644
Binary files a/sysui/desktop/icons/oasis-web-template.icns and b/sysui/desktop/icons/oasis-web-template.icns differ
diff --git a/sysui/desktop/icons/oasis-web-template.ico b/sysui/desktop/icons/oasis-web-template.ico
deleted file mode 100644
index 63ac9f3..0000000
Binary files a/sysui/desktop/icons/oasis-web-template.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo3_base_app.ico b/sysui/desktop/icons/ooo3_base_app.ico
old mode 100755
new mode 100644
index ba96b79..c728e83
Binary files a/sysui/desktop/icons/ooo3_base_app.ico and b/sysui/desktop/icons/ooo3_base_app.ico differ
diff --git a/sysui/desktop/icons/ooo3_calc_app.ico b/sysui/desktop/icons/ooo3_calc_app.ico
old mode 100755
new mode 100644
index c960415..f46433e
Binary files a/sysui/desktop/icons/ooo3_calc_app.ico and b/sysui/desktop/icons/ooo3_calc_app.ico differ
diff --git a/sysui/desktop/icons/ooo3_draw_app.ico b/sysui/desktop/icons/ooo3_draw_app.ico
old mode 100755
new mode 100644
index 6e00cb8..74abe03
Binary files a/sysui/desktop/icons/ooo3_draw_app.ico and b/sysui/desktop/icons/ooo3_draw_app.ico differ
diff --git a/sysui/desktop/icons/ooo3_impress_app.ico b/sysui/desktop/icons/ooo3_impress_app.ico
old mode 100755
new mode 100644
index 23ee3ec..1eed9c1
Binary files a/sysui/desktop/icons/ooo3_impress_app.ico and b/sysui/desktop/icons/ooo3_impress_app.ico differ
diff --git a/sysui/desktop/icons/ooo3_main_app.ico b/sysui/desktop/icons/ooo3_main_app.ico
old mode 100755
new mode 100644
index 98fcea3..f858d92
Binary files a/sysui/desktop/icons/ooo3_main_app.ico and b/sysui/desktop/icons/ooo3_main_app.ico differ
diff --git a/sysui/desktop/icons/ooo3_math_app.ico b/sysui/desktop/icons/ooo3_math_app.ico
old mode 100755
new mode 100644
index 605814c..a712362
Binary files a/sysui/desktop/icons/ooo3_math_app.ico and b/sysui/desktop/icons/ooo3_math_app.ico differ
diff --git a/sysui/desktop/icons/ooo3_open.ico b/sysui/desktop/icons/ooo3_open.ico
deleted file mode 100755
index 98fcea3..0000000
Binary files a/sysui/desktop/icons/ooo3_open.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo3_writer_app.ico b/sysui/desktop/icons/ooo3_writer_app.ico
old mode 100755
new mode 100644
index 005bd58..3e7efa6
Binary files a/sysui/desktop/icons/ooo3_writer_app.ico and b/sysui/desktop/icons/ooo3_writer_app.ico differ
diff --git a/sysui/desktop/icons/presentation-template.icns b/sysui/desktop/icons/presentation-template.icns
index f4d0187..5cdf700 100644
Binary files a/sysui/desktop/icons/presentation-template.icns and b/sysui/desktop/icons/presentation-template.icns differ
diff --git a/sysui/desktop/icons/presentation-template.ico b/sysui/desktop/icons/presentation-template.ico
deleted file mode 100644
index 4719403..0000000
Binary files a/sysui/desktop/icons/presentation-template.ico and /dev/null differ
diff --git a/sysui/desktop/icons/presentation.icns b/sysui/desktop/icons/presentation.icns
index 091be5b..3f6e268 100644
Binary files a/sysui/desktop/icons/presentation.icns and b/sysui/desktop/icons/presentation.icns differ
diff --git a/sysui/desktop/icons/presentation.ico b/sysui/desktop/icons/presentation.ico
deleted file mode 100644
index 360ef79..0000000
Binary files a/sysui/desktop/icons/presentation.ico and /dev/null differ
diff --git a/sysui/desktop/icons/so9_base_app.ico b/sysui/desktop/icons/so9_base_app.ico
old mode 100755
new mode 100644
index aa7036e..56a323c
Binary files a/sysui/desktop/icons/so9_base_app.ico and b/sysui/desktop/icons/so9_base_app.ico differ
diff --git a/sysui/desktop/icons/so9_calc_app.ico b/sysui/desktop/icons/so9_calc_app.ico
old mode 100755
new mode 100644
index d7182ca..81e6948
Binary files a/sysui/desktop/icons/so9_calc_app.ico and b/sysui/desktop/icons/so9_calc_app.ico differ
diff --git a/sysui/desktop/icons/so9_draw_app.ico b/sysui/desktop/icons/so9_draw_app.ico
old mode 100755
new mode 100644
index a8b3c32..a2c108a
Binary files a/sysui/desktop/icons/so9_draw_app.ico and b/sysui/desktop/icons/so9_draw_app.ico differ
diff --git a/sysui/desktop/icons/so9_impress_app.ico b/sysui/desktop/icons/so9_impress_app.ico
old mode 100755
new mode 100644
index cf10331..0fe4cea
Binary files a/sysui/desktop/icons/so9_impress_app.ico and b/sysui/desktop/icons/so9_impress_app.ico differ
diff --git a/sysui/desktop/icons/so9_main_app.ico b/sysui/desktop/icons/so9_main_app.ico
old mode 100755
new mode 100644
index 90f193d..197b924
Binary files a/sysui/desktop/icons/so9_main_app.ico and b/sysui/desktop/icons/so9_main_app.ico differ
diff --git a/sysui/desktop/icons/so9_math_app.ico b/sysui/desktop/icons/so9_math_app.ico
old mode 100755
new mode 100644
index 11fbbf9..4d947c2
Binary files a/sysui/desktop/icons/so9_math_app.ico and b/sysui/desktop/icons/so9_math_app.ico differ
diff --git a/sysui/desktop/icons/so9_open.ico b/sysui/desktop/icons/so9_open.ico
deleted file mode 100755
index 90f193d..0000000
Binary files a/sysui/desktop/icons/so9_open.ico and /dev/null differ
diff --git a/sysui/desktop/icons/so9_writer_app.ico b/sysui/desktop/icons/so9_writer_app.ico
old mode 100755
new mode 100644
index 10c964d..2df2083
Binary files a/sysui/desktop/icons/so9_writer_app.ico and b/sysui/desktop/icons/so9_writer_app.ico differ
diff --git a/sysui/desktop/icons/spreadsheet-template.icns b/sysui/desktop/icons/spreadsheet-template.icns
index d2dfa84..058a147 100644
Binary files a/sysui/desktop/icons/spreadsheet-template.icns and b/sysui/desktop/icons/spreadsheet-template.icns differ
diff --git a/sysui/desktop/icons/spreadsheet-template.ico b/sysui/desktop/icons/spreadsheet-template.ico
deleted file mode 100644
index be267eb..0000000
Binary files a/sysui/desktop/icons/spreadsheet-template.ico and /dev/null differ
diff --git a/sysui/desktop/icons/spreadsheet.icns b/sysui/desktop/icons/spreadsheet.icns
index 5c89354..8594b9b 100644
Binary files a/sysui/desktop/icons/spreadsheet.icns and b/sysui/desktop/icons/spreadsheet.icns differ
diff --git a/sysui/desktop/icons/spreadsheet.ico b/sysui/desktop/icons/spreadsheet.ico
deleted file mode 100644
index a88045e..0000000
Binary files a/sysui/desktop/icons/spreadsheet.ico and /dev/null differ
diff --git a/sysui/desktop/icons/text-template.icns b/sysui/desktop/icons/text-template.icns
index 8b9694a..0f7c006 100644
Binary files a/sysui/desktop/icons/text-template.icns and b/sysui/desktop/icons/text-template.icns differ
diff --git a/sysui/desktop/icons/text-template.ico b/sysui/desktop/icons/text-template.ico
deleted file mode 100644
index 0798692..0000000
Binary files a/sysui/desktop/icons/text-template.ico and /dev/null differ
diff --git a/sysui/desktop/icons/text.icns b/sysui/desktop/icons/text.icns
index 401d2b9..169ef09 100644
Binary files a/sysui/desktop/icons/text.icns and b/sysui/desktop/icons/text.icns differ
diff --git a/sysui/desktop/icons/text.ico b/sysui/desktop/icons/text.ico
deleted file mode 100644
index f19a781..0000000
Binary files a/sysui/desktop/icons/text.ico and /dev/null differ
commit 75459735b3cd9010570d63ddc3432f22d2c46bd8
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Sep 23 08:24:25 2010 +0200

    LibreOffice branding: make desktop integration work (fix2)

diff --git a/sysui/desktop/redhat/redhat-menus.spec b/sysui/desktop/redhat/redhat-menus.spec
index cc14a96..8328bd3 100644
--- a/sysui/desktop/redhat/redhat-menus.spec
+++ b/sysui/desktop/redhat/redhat-menus.spec
@@ -5,7 +5,7 @@ Summary: %productname desktop integration
 Name: %pkgprefix-redhat-menus
 Group: Office
 License: LGPL
-Vendor: LibreOffice
+Vendor: The Document Foundation
 AutoReqProv: no
 BuildArch: noarch
 Requires: redhat-release
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index 84af1c7..ebe1326 100644
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -94,15 +94,15 @@ mkdir -p ${DESTDIR}/usr/bin
 
 office_root=/opt/${PREFIX}
 
-ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/soffice
-
 cp openoffice.sh ${DESTDIR}/usr/bin/${PREFIX}
 cp printeradmin.sh ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
 chmod 0755 ${DESTDIR}/usr/bin/${PREFIX} ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
 
+ln -sf /usr/bin/${PREFIX} ${DESTDIR}/usr/bin/libreoffice
+
 mkdir -p ${DESTDIR}/usr/share/mime/packages
-cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/
-chmod 0644 ${DESTDIR}/usr/share/mime/packages/openoffice.org.xml
+cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/libreoffice.xml
+chmod 0644 ${DESTDIR}/usr/share/mime/packages/libreoffice.xml
 
 mkdir -p ${DESTDIR}/usr/share/applications
 for i in `cat launcherlist`; do
diff --git a/sysui/desktop/suse/suse-menus.spec b/sysui/desktop/suse/suse-menus.spec
index c731153..52df81f 100644
--- a/sysui/desktop/suse/suse-menus.spec
+++ b/sysui/desktop/suse/suse-menus.spec
@@ -280,7 +280,7 @@ for themedir in /opt/gnome/share/icons/gnome /opt/gnome/share/icons/hicolor /opt
 done
 
 %files
-%attr(0755,root,root) /usr/bin/soffice
+%attr(0755,root,root) /usr/bin/libreoffice
 %attr(0755,root,root) %verify(not size md5) /usr/bin/%unixfilename
 %attr(0755,root,root) /usr/bin/%unixfilename-printeradmin
 %defattr(0644, root, root)
commit bcdacc09dd653f077b59cce7c6a9ae0c1ef9d4b0
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Sep 22 15:32:16 2010 +0200

    LibreOffice Branding: first cut

diff --git a/desktop/util/ooverinfo.rc b/desktop/util/ooverinfo.rc
index 6d92e2a..441a008 100644
--- a/desktop/util/ooverinfo.rc
+++ b/desktop/util/ooverinfo.rc
@@ -63,7 +63,7 @@ VS_VERSION_INFO versioninfo
 			block "040704E4"
 			{
 				// German StringTable
-				value "CompanyName",		"OpenOffice.org\0"
+                value "CompanyName",		"The Document Foundation\0"
 				value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
 				value "FileVersion",		PPS(VER_LEVEL) "\0"
 				value "ProductVersion",		PPS(VER_LEVEL) "\0"
@@ -75,7 +75,7 @@ VS_VERSION_INFO versioninfo
 			block "040904E4"
 			{
 				// International StringTable
-				value "CompanyName", 		"OpenOffice.org\0"
+                value "CompanyName", 		"The Document Foundation\0"
 				value "FileDescription",	"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
 				value "FileVersion",		PPS(VER_LEVEL) "\0"
 				value "ProductVersion",		PPS(VER_LEVEL) "\0"
diff --git a/desktop/util/template.manifest b/desktop/util/template.manifest
index dbed81c..f5b196a 100644
--- a/desktop/util/template.manifest
+++ b/desktop/util/template.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<assemblyIdentity version="1.0.0.0" processorArchitecture="x86" name="OpenOffice" type="win32" />
+<assemblyIdentity version="1.0.0.0" processorArchitecture="x86" name="LibreOffice" type="win32" />
 <description>http://www.openoffice.org</description>
 <dependency>
 <dependentAssembly>
diff --git a/desktop/util/verinfo.rc b/desktop/util/verinfo.rc
index 7d58995..5cbe073 100755
--- a/desktop/util/verinfo.rc
+++ b/desktop/util/verinfo.rc
@@ -68,7 +68,7 @@ VS_VERSION_INFO versioninfo
 			block "040704E4"
 			{
 				// German StringTable
-				value "CompanyName",		"Oracle\0"
+                value "CompanyName",		"The Document Foundation\0"
 				value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
 				value "FileVersion",		PPS(VER_LEVEL) "\0"
 				value "ProductVersion",		PPS(VER_LEVEL) "\0"
@@ -80,7 +80,7 @@ VS_VERSION_INFO versioninfo
 			block "040904E4"
 			{
 				// International StringTable
-				value "CompanyName", 		"Oracle\0"
+                value "CompanyName", 		"The Document Foundation\0"
 				value "FileDescription",	"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
 				value "FileVersion",		PPS(VER_LEVEL) "\0"
 				value "ProductVersion",		PPS(VER_LEVEL) "\0"
diff --git a/readlicense_oo/source/license/license_en-US.txt b/readlicense_oo/source/license/license_en-US.txt
index 52fd9d1..73b1ce4 100644
--- a/readlicense_oo/source/license/license_en-US.txt
+++ b/readlicense_oo/source/license/license_en-US.txt
@@ -1,4 +1,4 @@
-This product is made available subject to the terms of GNU Lesser General Public License Version 3. A copy of the LGPL license can be found at http://www.openoffice.org/license.html
+This product is made available subject to the terms of GNU Lesser General Public License Version 3. A copy of the LGPL license can be found at http://www.gnu.org/licenses/lgpl-3.0-standalone.html
 
 ------------------------------------
 Third Party Code. Additional copyright notices and license terms applicable to portions of the Software are set forth in the THIRDPARTYLICENSEREADME.html file.
@@ -9,7 +9,7 @@ All trademarks and registered trademarks mentioned herein are the property of th
 ------------------------------------
 Copyright (c) 2000,2010 Oracle and/or it affiliates. All rights reserved.
 
-This product has been created with contributions from the OpenOffice.org community, of which Oracle is a principal member. OpenOffice.org acknowledges all community members, especially those mentioned at http://www.openoffice.org/welcome/credits.html.
+This product has been created with contributions from the OpenOffice.org community. We acknowledge all community members, especially those mentioned at http://www.openoffice.org/welcome/credits.html.
 
 ------------------------------------
 
diff --git a/sysui/desktop/debian/control b/sysui/desktop/debian/control
index 608496d..da25ee4 100644
--- a/sysui/desktop/debian/control
+++ b/sysui/desktop/debian/control
@@ -1,6 +1,6 @@
 Description: %productname desktop integration
-Maintainer: OpenOffice.org
+Maintainer: LibreOffice
 Architecture: all
-Provides: openoffice.org-desktop-integration, openoffice.org-unbundled
-Conflicts: openofficeorg-desktop-integration, openofficeorg-debian-menus, openoffice.org-bundled
-Replaces: openofficeorg-desktop-integration, openofficeorg-debian-menus
+Provides: libreoffice-desktop-integration, libreoffice-unbundled
+Conflicts: libreoffice-desktop-integration, libreoffice-debian-menus, libreoffice-bundled
+Replaces: libreoffice-desktop-integration, libreoffice-debian-menus
diff --git a/sysui/desktop/debian/openoffice.org-debian-menus b/sysui/desktop/debian/openoffice.org-debian-menus
index bf30a91..c477d73 100644
--- a/sysui/desktop/debian/openoffice.org-debian-menus
+++ b/sysui/desktop/debian/openoffice.org-debian-menus
@@ -1,39 +1,39 @@
-?package(openoffice.org-writer):needs="X11" section="Apps/Editors"\
+?package(libreoffice-writer):needs="X11" section="Apps/Editors"\
   title="%PRODUCTNAME Writer" command="%PREFIX -writer"\
   hints="Word Processors"\
   kderemove="y"\
   icon="/usr/share/icons/hicolor/32x32/apps/%ICONPREFIX-writer.png"\
   icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-writer.png"
 
-?package(openoffice.org-calc):needs="X11" section="Apps/Math"\
+?package(libreoffice-calc):needs="X11" section="Apps/Math"\
   title="%PRODUCTNAME Calc" command="%PREFIX -calc"\
   hints="Spreadsheets"\
   kderemove="y"\
   icon="/usr/share/icons/hicolor/32x32/apps/%ICONPREFIX-calc.png"\
   icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-calc.png"
 
-?package(openoffice.org-draw):needs="X11" section="Apps/Graphics"\
+?package(libreoffice-draw):needs="X11" section="Apps/Graphics"\
   title="%PRODUCTNAME Draw" command="%PREFIX -draw"\
   hints="Drawing"\
   kderemove="y"\
   icon="/usr/share/icons/hicolor/32x32/apps/%ICONPREFIX-draw.png"\
   icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-draw.png"
 
-?package(openoffice.org-impress):needs="X11" section="Apps/Graphics"\
+?package(libreoffice-impress):needs="X11" section="Apps/Graphics"\
   title="%PRODUCTNAME Impress" command="%PREFIX -impress"\
   hints="Presentation"\
   kderemove="y"\
   icon="/usr/share/icons/hicolor/32x32/apps/%ICONPREFIX-impress.png"\
   icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-impress.png"
 
-?package(openoffice.org-base):needs="X11" section="Apps/Databases"\
+?package(libreoffice-base):needs="X11" section="Apps/Databases"\
   title="%PRODUCTNAME Base" command="%PREFIX -base"\
   hints="Database"\
   kderemove="y"\
   icon="/usr/share/icons/hicolor/32x32/apps/%ICONPREFIX-base.png"\
   icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-base.png"
 
-?package(openoffice.org-core02):needs="X11" section="Apps/System"\
+?package(libreoffice-core02):needs="X11" section="Apps/System"\
   title="%PRODUCTNAME Printer Administration"\
   command="%PREFIX-printeradmin"\
   hints="Setup,Printer,Config"\
diff --git a/sysui/desktop/debian/postinst b/sysui/desktop/debian/postinst
index 19753b5..67161df 100644
--- a/sysui/desktop/debian/postinst
+++ b/sysui/desktop/debian/postinst
@@ -80,7 +80,7 @@ if [ "$1" = "configure" ]
 then
   # backing out existing entries to avoid duplicates
   sed '
-/^# OpenOffice.org/d
+/^# LibreOffice/d
 /^application\/vnd\.oasis\.opendocument/d
 /^application\/vnd\.openofficeorg/d
 /^application\/vnd\.sun/d
@@ -96,7 +96,7 @@ then
 
   # now append our stuff to the temporary file
   cat >> /etc/mailcap.tmp$$ << END
-# OpenOffice.org
+# LibreOffice
 application/vnd.oasis.opendocument.text; %PREFIX -view %s
 application/vnd.oasis.opendocument.text-template; %PREFIX -view %s
 application/vnd.oasis.opendocument.text-web; %PREFIX -view %s
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec
index 1649971..01bec9f 100644
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -7,7 +7,7 @@ Name: %pkgprefix-freedesktop-menus
 #BuildRequires: perl
 Group: Office
 License: LGPL
-Provides: openoffice.org3-desktop-integration
+Provides: libreoffice-desktop-integration
 Conflicts: %pkgprefix-suse-menus
 Conflicts: %pkgprefix-debian-menus
 Conflicts: %pkgprefix-redhat-menus
@@ -187,7 +187,7 @@ if [ "$1" = 1 ]
 then
   # backing out existing entries to avoid duplicates
   sed '
-/^# OpenOffice.org/d
+/^# LibreOffice/d
 /^application\/vnd\.oasis\.opendocument/d
 /^application\/vnd\.openofficeorg/d
 /^application\/vnd\.sun/d
@@ -203,7 +203,7 @@ then
 
   # now append our stuff to the temporary file
   cat >> /etc/mailcap.tmp$$ << END
-# OpenOffice.org
+# LibreOffice
 application/vnd.oasis.opendocument.text; %unixfilename -view %s
 application/vnd.oasis.opendocument.text-template; %unixfilename -view %s
 application/vnd.oasis.opendocument.text-web; %unixfilename -view %s
diff --git a/sysui/desktop/mandriva/mandriva-menus.spec b/sysui/desktop/mandriva/mandriva-menus.spec
index 4c02c70..f02a468 100644
--- a/sysui/desktop/mandriva/mandriva-menus.spec
+++ b/sysui/desktop/mandriva/mandriva-menus.spec
@@ -13,7 +13,7 @@ BuildArch: noarch
 #        here and check for the 'mandriva-release' in the future (next year).
 #
 Requires: mandrake-release
-Provides: openoffice.org3-desktop-integration
+Provides: libreoffice-desktop-integration
 
 %define _unpackaged_files_terminate_build 0
 %define _binary_filedigest_algorithm 1
@@ -107,7 +107,7 @@ if [ "$1" = 1 ]
 then
   # backing out existing entries to avoid duplicates
   sed '
-/^# OpenOffice.org/d
+/^# LibreOffice/d
 /^application\/vnd\.oasis\.opendocument/d
 /^application\/vnd\.openofficeorg/d
 /^application\/vnd\.sun/d
@@ -309,7 +309,7 @@ fi
 
 
 %files
-%attr(0755,root,root) /usr/bin/soffice
+%attr(0755,root,root) /usr/bin/%unixfilename
 %attr(0755,root,root) %verify(not size md5) /usr/bin/%unixfilename
 %attr(0755,root,root) /usr/bin/%unixfilename-printeradmin
 %defattr(0644, root, root)
diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
index 9497666..dea43ca 100644
--- a/sysui/desktop/menus/base.desktop
+++ b/sysui/desktop/menus/base.desktop
@@ -4,7 +4,7 @@ Terminal=false
 Icon=base
 Type=Application
 Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-MoreApplications-Databases;
-Exec=openoffice -base %U
+Exec=${UNIXBASISROOTNAME} -base %U
 MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base;
 Name=%PRODUCTNAME Base
 GenericName=Database Development
diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
index bc0c9ee..659f60a 100644
--- a/sysui/desktop/menus/calc.desktop
+++ b/sysui/desktop/menus/calc.desktop
@@ -4,7 +4,7 @@ Terminal=false
 Icon=calc
 Type=Application
 Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Spreadsheets;
-Exec=openoffice -calc %U
+Exec=${UNIXBASISROOTNAME} -calc %U
 MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;
 Name=%PRODUCTNAME Calc
 GenericName=Spreadsheet
diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
index 42db7c6..f90dc6e 100644
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
@@ -4,7 +4,7 @@ Terminal=false
 Icon=draw
 Type=Application
 Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Drawing;
-Exec=openoffice -draw %U
+Exec=${UNIXBASISROOTNAME} -draw %U
 MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw;
 Name=%PRODUCTNAME Draw
 GenericName=Drawing Program
diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop
index 90df11a..c35d46c 100644
--- a/sysui/desktop/menus/impress.desktop
+++ b/sysui/desktop/menus/impress.desktop
@@ -4,7 +4,7 @@ Terminal=false
 Icon=impress
 Type=Application
 Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Presentations;
-Exec=openoffice -impress %U
+Exec=${UNIXBASISROOTNAME} -impress %U
 MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;
 Name=%PRODUCTNAME Impress
 GenericName=Presentation
diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
index f97536d..514a6ec 100644
--- a/sysui/desktop/menus/math.desktop
+++ b/sysui/desktop/menus/math.desktop
@@ -4,7 +4,7 @@ Terminal=false
 Icon=math
 Type=Application
 Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other;
-Exec=openoffice -math %U
+Exec=${UNIXBASISROOTNAME} -math %U
 MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math;
 Name=%PRODUCTNAME Math
 GenericName=Formula Editor
diff --git a/sysui/desktop/menus/printeradmin.desktop b/sysui/desktop/menus/printeradmin.desktop
index 9ddd9bf..17b5831 100644
--- a/sysui/desktop/menus/printeradmin.desktop
+++ b/sysui/desktop/menus/printeradmin.desktop
@@ -4,5 +4,5 @@ Terminal=false
 Icon=printeradmin
 Type=Application
 Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;
-Exec=openoffice-printeradmin
+Exec=${UNIXBASISROOTNAME}-printeradmin
 Name=%PRODUCTNAME Printer Administration
diff --git a/sysui/desktop/menus/qstart.desktop b/sysui/desktop/menus/qstart.desktop
index 17e4edf..1cded62 100644
--- a/sysui/desktop/menus/qstart.desktop
+++ b/sysui/desktop/menus/qstart.desktop
@@ -3,7 +3,7 @@ Version=1.0
 Terminal=false
 Type=Application
 Categories=Office;
-Exec=openoffice -quickstart -nologo -nodefault
+Exec=${UNIXBASISROOTNAME} -quickstart -nologo -nodefault
 NoDisplay=true
 Name=%PRODUCTNAME Quickstarter
 Comment=Hook for quickstarter startup
diff --git a/sysui/desktop/menus/startcenter.desktop b/sysui/desktop/menus/startcenter.desktop
index 6302a5b..224f0e6 100644
--- a/sysui/desktop/menus/startcenter.desktop
+++ b/sysui/desktop/menus/startcenter.desktop
@@ -4,7 +4,7 @@ Terminal=false
 Icon=startcenter
 Type=Application
 Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other;
-Exec=openoffice %U
+Exec=${UNIXBASISROOTNAME} %U
 MimeType=application/vnd.openofficeorg.extension;
 Name=%PRODUCTNAME 
 GenericName=Office 
diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop
index 1509de0..12307d4 100644
--- a/sysui/desktop/menus/writer.desktop
+++ b/sysui/desktop/menus/writer.desktop
@@ -4,7 +4,7 @@ Terminal=false
 Icon=writer
 Type=Application
 Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Wordprocessors;
-Exec=openoffice -writer %U
+Exec=${UNIXBASISROOTNAME} -writer %U

... etc. - the rest is truncated
