Merge branch 'master' into feature/gnumake4

2482 files changed, 11457 insertions, 3285 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..acaf1d1889
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,12 @@
+# backup and temporary files
+*~
+.*.sw[op]
+.gitattributes
+
+# the build directories
+/*/unxlng??
+/*/unxlng??.pro
+/*/wntmsc???
+/*/wntmsc???.pro
+/*/unxmac??
+/*/unxmac??.pro
diff --git a/helpcontent2/.gitignore b/helpcontent2/.gitignore
new file mode 100644
index 0000000000..0ff7b08b34
--- /dev/null
+++ b/helpcontent2/.gitignore
@@ -0,0 +1 @@
+/wikisetup.txt
diff --git a/helpcontent2/help-to-wiki.py b/helpcontent2/help-to-wiki.py
new file mode 100755
index 0000000000..36281ed08a
--- /dev/null
+++ b/helpcontent2/help-to-wiki.py
@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+
+import sys, os, getopt, signal
+
+sys.path.append(sys.path[0]+"/to-wiki")
+import wikiconv2
+
+# FIXME do proper modules from getalltitles & wikiconv2
+# [so far this is in fact just a shell thing]
+
+def usage():
+    print '''
+help-to-wiki.py [params] [path to l10n]
+
+Converts .xhp files into a wiki
+
+-h, --help            - this help
+-n, --no-translations - generate only English pages
+-r, --redirects       - generate also redirect pages
+
+Most probably, you want to generate the redirects only once when you initially
+populate the wiki, and then only update the ones that broke.\n'''
+
+def create_wiki_dirs():
+    dirs = [
+            "Common",
+            "Basic",
+            "Calc",
+            "Chart",
+            "Draw",
+            "Impress",
+            "Math",
+            "Writer",
+            "swriter",
+            "scalc",
+            "simpress",
+            "sdraw",
+            "smath",
+            "schart",
+            "sbasic",
+            "sdatabase"
+           ]
+
+    try:
+        os.mkdir( "wiki" )
+    except:
+        sys.stdout.write( "wiki already generated - the wiki/ subdir exists\n" )
+        sys.exit( 1 )
+
+    for i in dirs:
+        try:
+            os.mkdir( "wiki/" + i )
+        except:
+            pass
+
+# Langs to handle
+langs = ['', 'ca', 'cs', 'da', 'de', 'es', 'fr', 'hu', \
+         'it', 'ja', 'ko', 'nl', 'pl', 'pt', 'pt-BR', 'ru', \
+         'sl', 'sv', 'vi', 'zh-CN', 'zh-TW' ]
+
+# Argument handling
+try:
+    opts, args = getopt.getopt(sys.argv[1:], 'hnr', ['help', 'no-translations', 'redirects'])
+except getopt.GetoptError:
+    usage()
+    sys.exit(1)
+
+generate_redirects = False
+for opt, arg in opts:
+    if opt in ('-h', '--help'):
+        usage()
+        sys.exit()
+    elif opt in ('-n', '--no-translations'):
+        langs = ['']
+    elif opt in ('-r', '--redirects'):
+        generate_redirects = True
+
+def signal_handler(signal, frame):
+    sys.stderr.write( 'Exiting...\n' )
+    sys.exit(1)
+
+# Do the work
+signal.signal(signal.SIGINT, signal_handler)
+
+create_wiki_dirs()
+
+print "Generating the titles..."
+os.system( "python to-wiki/getalltitles.py source/text > alltitles.csv" )
+
+try:
+    sdf_path = args[0]
+except:
+    sdf_path = '../../l10n/l10n/source'
+    sys.stderr.write('Path to the .sdf files not provided, using "%s"\n'% sdf_path)
+
+# do the work
+for lang in langs:
+    wikiconv2.convert(generate_redirects, lang, '%s/%s/localize.sdf'% (sdf_path, lang))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/helpcontent2/helpers/help_hid.lst b/helpcontent2/helpers/help_hid.lst
index 0f0dac1ce3..d9c1db7b7e 100644
--- a/helpcontent2/helpers/help_hid.lst
+++ b/helpcontent2/helpers/help_hid.lst
@@ -1737,7 +1737,7 @@ HID_EVT_APPROVEROWCHANGE,38096,
 HID_EVT_BEFOREUPDATE,38070,
 HID_EVT_CHANGED,38089,
 HID_EVT_CONFIRMDELETE,38071,
-HID_EVT_ERROROCCURED,38072,
+HID_EVT_ERROROCCURRED,38072,
 HID_EVT_FOCUSGAINED,38073,
 HID_EVT_FOCUSLOST,38074,
 HID_EVT_ITEMSTATECHANGED,38075,
@@ -3520,6 +3520,7 @@ HID_SCPAGE_SUBT_GROUP2,58886,
 HID_SCPAGE_SUBT_GROUP3,58887,
 HID_SCPAGE_SUBT_OPTIONS,58875,
 HID_SCPAGE_TABLE,58883,
+HID_SCPAGE_DEFAULTS,58894,
 HID_SCPAGE_USERLISTS,58880,
 HID_SCRIPTORG_DIALOG,39987,
 HID_SCRIPTSBOX,40011,
@@ -4157,7 +4158,6 @@ HID_SVXPAGE_SWPOSSIZE,39977,
 HID_SVXTBX_DRAW,33954,
 HID_SVXTBX_UNDO_REDO_CTRL,34189,
 HID_SVX_BASIC_DIALOG_ORGANIZER,40014,
-HID_SVX_BASIC_MACRO_ORGANIZER,40013,
 HID_SVX_CHINESE_DICTIONARY_CB_REVERSE,40022,
 HID_SVX_CHINESE_DICTIONARY_LB_HEADER,40023,
 HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED,40024,
@@ -4167,7 +4167,6 @@ HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL,40021,
 HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS,40019,
 HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED,40017,
 HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL,40018,
-HID_SVX_COMMON_MACRO_ORGANIZER,40015,
 HID_SVX_CONFIG_EVENT,40001,
 HID_SVX_CONFIG_ICON_SELECTOR,40044,
 HID_SVX_CONFIG_MENU,40007,
@@ -5392,7 +5391,6 @@ SID_HORIZONTAL,27035,.uno:MirrorHorz
 SID_HTML_MODE,10414,.uno:HtmlMode
 SID_HYPERLINK_DIALOG,5678,.uno:HyperlinkDialog
 SID_HYPERLINK_GETLINK,10361,.uno:Hyperlink
-SID_HYPERLINK_INSERT,10360,.uno:InsertHyperlink
 SID_HYPERLINK_SETLINK,10362,.uno:SetHyperlink
 SID_HYPHENATION,27340,.uno:Hyphenation
 SID_H_ALIGNCELL,26380,.uno:HorizontalAlignment
@@ -6102,7 +6100,7 @@ UID_BRWEVT_APPROVEROWCHANGE,37990,
 UID_BRWEVT_BEFOREUPDATE,37982,
 UID_BRWEVT_CHANGED,37966,
 UID_BRWEVT_CONFIRMDELETE,37989,
-UID_BRWEVT_ERROROCCURED,37995,
+UID_BRWEVT_ERROROCCURRED,37995,
 UID_BRWEVT_FOCUSGAINED,37969,
 UID_BRWEVT_FOCUSLOST,37970,
 UID_BRWEVT_ITEMSTATECHANGED,37968,
diff --git a/helpcontent2/helpers/longnames_commands.csv b/helpcontent2/helpers/longnames_commands.csv
index fadc7b6a13..3ba7bfd355 100644
--- a/helpcontent2/helpers/longnames_commands.csv
+++ b/helpcontent2/helpers/longnames_commands.csv
@@ -1254,7 +1254,6 @@ SID_HORIZONTAL,.uno:MirrorHorz
 SID_HTML_MODE,.uno:HtmlMode
 SID_HYPERLINK_DIALOG,.uno:HyperlinkDialog
 SID_HYPERLINK_GETLINK,.uno:Hyperlink
-SID_HYPERLINK_INSERT,.uno:InsertHyperlink
 SID_HYPERLINK_SETLINK,.uno:SetHyperlink
 SID_HYPHENATION,.uno:Hyphenation
 SID_H_ALIGNCELL,.uno:HorizontalAlignment
diff --git a/helpcontent2/helpers/uno-commands.csv b/helpcontent2/helpers/uno-commands.csv
index baf0aaa922..7ce92427e8 100644
--- a/helpcontent2/helpers/uno-commands.csv
+++ b/helpcontent2/helpers/uno-commands.csv
@@ -955,7 +955,6 @@
 .uno:InsertGrids
 .uno:InsertHardHyphen
 .uno:InsertHeader
-.uno:InsertHyperlink
 .uno:InsertHyperlinkDlg
 .uno:InsertImage
 .uno:InsertImageControl
diff --git a/helpcontent2/helpers/uno_hid.lst b/helpcontent2/helpers/uno_hid.lst
index 1f034e4f87..81ca33632d 100644
--- a/helpcontent2/helpers/uno_hid.lst
+++ b/helpcontent2/helpers/uno_hid.lst
@@ -1252,7 +1252,6 @@ SID_HORIZONTAL,27035,.uno:MirrorHorz
 SID_HTML_MODE,10414,.uno:HtmlMode
 SID_HYPERLINK_DIALOG,5678,.uno:HyperlinkDialog
 SID_HYPERLINK_GETLINK,10361,.uno:Hyperlink
-SID_HYPERLINK_INSERT,10360,.uno:InsertHyperlink
 SID_HYPERLINK_SETLINK,10362,.uno:SetHyperlink
 SID_HYPHENATION,27340,.uno:Hyphenation
 SID_H_ALIGNCELL,26380,.uno:HorizontalAlignment
diff --git a/helpcontent2/helpers/unocmds.txt b/helpcontent2/helpers/unocmds.txt
index 00374d0157..e6a0a375d6 100644
--- a/helpcontent2/helpers/unocmds.txt
+++ b/helpcontent2/helpers/unocmds.txt
@@ -568,7 +568,6 @@
 .uno:InsertGraphic;shared/01/04140000.xhp
 .uno:InsertGraphicRuler;swriter/01/04210000.xhp
 .uno:InsertGrids;schart/01/04070000.xhp
-.uno:InsertHyperlink;shared/01/04110000.xhp
 .uno:InsertHyperlinkDlg;shared/01/05020400.xhp
 .uno:InsertImageControl;sbasic/shared/02/20000000.xhp
 .uno:InsertIndexesEntry;swriter/01/04120100.xhp
diff --git a/helpcontent2/prj/build.lst b/helpcontent2/prj/build.lst
index eceb7337bf..8550762ac3 100644
--- a/helpcontent2/prj/build.lst
+++ b/helpcontent2/prj/build.lst
@@ -1,4 +1,4 @@
-h2	helpcontent2 :    L10N:l10n xmlhelp NULL
+h2	helpcontent2 :    TRANSLATIONS:translations xmlhelp NULL
 h2	helpcontent2                                           usr1  - all helpcontent2_mkout helpcontent2_aux NULL
 h2	helpcontent2\prj                                       get   - all helpcontent2_prj helpcontent2_aux NULL
 h2	helpcontent2\source\text\sbasic\guide                  nmake - all helpcontent2_sbas_guid helpcontent2_aux NULL
diff --git a/helpcontent2/prj/d.lst b/helpcontent2/prj/d.lst
index 9f068ff3dc..0a058a9527 100644
--- a/helpcontent2/prj/d.lst
+++ b/helpcontent2/prj/d.lst
@@ -1,15 +1,15 @@
-mkdir: %_DEST%\pck%_EXT%
-mkdir: %COMMON_DEST%\bin%_EXT%
+mkdir: %_DEST%\pck
+mkdir: %COMMON_DEST%\bin
 
-..\helpers\hid.lst %COMMON_DEST%\bin%_EXT%\hid.lst
-..\%__SRC%\bin\helpimg.ilst %COMMON_DEST%\res%_EXT%\img\helpimg.ilst
+..\helpers\hid.lst %COMMON_DEST%\bin\hid.lst
+..\%__SRC%\bin\helpimg.ilst %COMMON_DEST%\res\img\helpimg.ilst
 
-..\%__SRC%\bin\sbasic_*.zip %_DEST%\pck%_EXT%
-..\%__SRC%\bin\scalc_*.zip %_DEST%\pck%_EXT%
-..\%__SRC%\bin\schart_*.zip %_DEST%\pck%_EXT%
-..\%__SRC%\bin\sdatabase_*.zip %_DEST%\pck%_EXT%
-..\%__SRC%\bin\sdraw_*.zip %_DEST%\pck%_EXT%
-..\%__SRC%\bin\shared_*.zip %_DEST%\pck%_EXT%
-..\%__SRC%\bin\simpress_*.zip %_DEST%\pck%_EXT%
-..\%__SRC%\bin\smath_*.zip %_DEST%\pck%_EXT%
-..\%__SRC%\bin\swriter_*.zip %_DEST%\pck%_EXT%
+..\%__SRC%\bin\sbasic_*.zip %_DEST%\pck
+..\%__SRC%\bin\scalc_*.zip %_DEST%\pck
+..\%__SRC%\bin\schart_*.zip %_DEST%\pck
+..\%__SRC%\bin\sdatabase_*.zip %_DEST%\pck
+..\%__SRC%\bin\sdraw_*.zip %_DEST%\pck
+..\%__SRC%\bin\shared_*.zip %_DEST%\pck
+..\%__SRC%\bin\simpress_*.zip %_DEST%\pck
+..\%__SRC%\bin\smath_*.zip %_DEST%\pck
+..\%__SRC%\bin\swriter_*.zip %_DEST%\pck
diff --git a/helpcontent2/settings.pmk b/helpcontent2/settings.pmk
index c9d2722258..185438e89b 100755
--- a/helpcontent2/settings.pmk
+++ b/helpcontent2/settings.pmk
@@ -1,4 +1,5 @@
 .INCLUDE : $(LOCAL_COMMON_OUT)/inc$/aux_langs.mk
+.INCLUDE : $(LOCAL_COMMON_OUT)/inc$/help_exist.mk
 
 my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/juh.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/LuceneHelpWrapper.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/HelpIndexerTool.jar$
 
@@ -12,4 +13,5 @@ my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar$(PATH_SEPERA
 JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
 .ENDIF 
 
-aux_alllangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j  $i $(NULL))))
+aux_alllangiso_all:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j  $i $(NULL))))
+aux_alllangiso:=$(foreach,i,$(aux_alllangiso_all) $(foreach,j,$(help_exist) $(eq,$i,$j  $i $(NULL))))
diff --git a/helpcontent2/source/auxiliary/af/default.css b/helpcontent2/source/auxiliary/af/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/af/default.css
+++ b/helpcontent2/source/auxiliary/af/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/af/highcontrast1.css b/helpcontent2/source/auxiliary/af/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/af/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/af/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/af/highcontrast2.css b/helpcontent2/source/auxiliary/af/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/af/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/af/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/af/highcontrastblack.css b/helpcontent2/source/auxiliary/af/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/af/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/af/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/af/highcontrastwhite.css b/helpcontent2/source/auxiliary/af/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/af/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/af/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/af/sbasic.cfg b/helpcontent2/source/auxiliary/af/sbasic.cfg
index 2c2846d431..388af69796 100755..100644
--- a/helpcontent2/source/auxiliary/af/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/af/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/af/scalc.cfg b/helpcontent2/source/auxiliary/af/scalc.cfg
index aaf2d86bb7..7e89ba73c6 100755..100644
--- a/helpcontent2/source/auxiliary/af/scalc.cfg
+++ b/helpcontent2/source/auxiliary/af/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/af/schart.cfg b/helpcontent2/source/auxiliary/af/schart.cfg
index e9f25861aa..bc962e7ca6 100755..100644
--- a/helpcontent2/source/auxiliary/af/schart.cfg
+++ b/helpcontent2/source/auxiliary/af/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/af/sdatabase.cfg b/helpcontent2/source/auxiliary/af/sdatabase.cfg
index bf8f3073cd..1e30c70c85 100644
--- a/helpcontent2/source/auxiliary/af/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/af/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/af/sdraw.cfg b/helpcontent2/source/auxiliary/af/sdraw.cfg
index 2e3e45d8a0..d488f56f8d 100755..100644
--- a/helpcontent2/source/auxiliary/af/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/af/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/af/simpress.cfg b/helpcontent2/source/auxiliary/af/simpress.cfg
index 00771662eb..43f191f77f 100755..100644
--- a/helpcontent2/source/auxiliary/af/simpress.cfg
+++ b/helpcontent2/source/auxiliary/af/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/af/smath.cfg b/helpcontent2/source/auxiliary/af/smath.cfg
index 6e0c8a1f86..f19525f24b 100755..100644
--- a/helpcontent2/source/auxiliary/af/smath.cfg
+++ b/helpcontent2/source/auxiliary/af/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/af/swriter.cfg b/helpcontent2/source/auxiliary/af/swriter.cfg
index c3a3076492..48cdc6d863 100755..100644
--- a/helpcontent2/source/auxiliary/af/swriter.cfg
+++ b/helpcontent2/source/auxiliary/af/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ar/default.css b/helpcontent2/source/auxiliary/ar/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/ar/default.css
+++ b/helpcontent2/source/auxiliary/ar/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/ar/highcontrast1.css b/helpcontent2/source/auxiliary/ar/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/ar/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/ar/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ar/highcontrast2.css b/helpcontent2/source/auxiliary/ar/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/ar/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/ar/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ar/highcontrastblack.css b/helpcontent2/source/auxiliary/ar/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/ar/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/ar/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ar/highcontrastwhite.css b/helpcontent2/source/auxiliary/ar/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/ar/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/ar/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ar/sbasic.cfg b/helpcontent2/source/auxiliary/ar/sbasic.cfg
index ee62609355..d4da931cc2 100644
--- a/helpcontent2/source/auxiliary/ar/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/ar/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ar/scalc.cfg b/helpcontent2/source/auxiliary/ar/scalc.cfg
index 0841a9f87c..81a521a9aa 100644
--- a/helpcontent2/source/auxiliary/ar/scalc.cfg
+++ b/helpcontent2/source/auxiliary/ar/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ar/schart.cfg b/helpcontent2/source/auxiliary/ar/schart.cfg
index 274e4d7c43..4ae1d43e55 100644
--- a/helpcontent2/source/auxiliary/ar/schart.cfg
+++ b/helpcontent2/source/auxiliary/ar/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/ar/sdatabase.cfg b/helpcontent2/source/auxiliary/ar/sdatabase.cfg
index 60383e3859..ca3134a082 100644
--- a/helpcontent2/source/auxiliary/ar/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/ar/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ar/sdraw.cfg b/helpcontent2/source/auxiliary/ar/sdraw.cfg
index d035c09e11..d0a6ee3913 100644
--- a/helpcontent2/source/auxiliary/ar/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/ar/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ar/simpress.cfg b/helpcontent2/source/auxiliary/ar/simpress.cfg
index 58da3556ea..436b588292 100644
--- a/helpcontent2/source/auxiliary/ar/simpress.cfg
+++ b/helpcontent2/source/auxiliary/ar/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ar/smath.cfg b/helpcontent2/source/auxiliary/ar/smath.cfg
index b9e614d6eb..453bb2b1f6 100644
--- a/helpcontent2/source/auxiliary/ar/smath.cfg
+++ b/helpcontent2/source/auxiliary/ar/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ar/swriter.cfg b/helpcontent2/source/auxiliary/ar/swriter.cfg
index 08c0ac1046..44b3403e1b 100644
--- a/helpcontent2/source/auxiliary/ar/swriter.cfg
+++ b/helpcontent2/source/auxiliary/ar/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/be-BY/default.css b/helpcontent2/source/auxiliary/as/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/be-BY/default.css
+++ b/helpcontent2/source/auxiliary/as/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/be-BY/highcontrast1.css b/helpcontent2/source/auxiliary/as/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/be-BY/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/as/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/be-BY/highcontrast2.css b/helpcontent2/source/auxiliary/as/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/be-BY/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/as/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/be-BY/highcontrastblack.css b/helpcontent2/source/auxiliary/as/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/be-BY/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/as/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/be-BY/highcontrastwhite.css b/helpcontent2/source/auxiliary/as/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/be-BY/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/as/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/be-BY/sbasic.cfg b/helpcontent2/source/auxiliary/as/sbasic.cfg
index 4986dd645e..f28489bdcf 100755..100644
--- a/helpcontent2/source/auxiliary/be-BY/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/as/sbasic.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Basic
 
-Language=be-BY
+Language=as
 Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/be-BY/scalc.cfg b/helpcontent2/source/auxiliary/as/scalc.cfg
index 269efc977f..0891400f42 100755..100644
--- a/helpcontent2/source/auxiliary/be-BY/scalc.cfg
+++ b/helpcontent2/source/auxiliary/as/scalc.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Calc
 
-Language=be-BY
+Language=as
 Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/be-BY/schart.cfg b/helpcontent2/source/auxiliary/as/schart.cfg
index 68ab32dffb..ca06799fd3 100755..100644
--- a/helpcontent2/source/auxiliary/be-BY/schart.cfg
+++ b/helpcontent2/source/auxiliary/as/schart.cfg
@@ -1,9 +1,8 @@
 Title=%PRODUCTNAME Chart
 
-Language=be-BY
+Language=as
 Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/be-BY/sdatabase.cfg b/helpcontent2/source/auxiliary/as/sdatabase.cfg
index 68e0299ffc..67dd271246 100644
--- a/helpcontent2/source/auxiliary/be-BY/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/as/sdatabase.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Base
 
-Language=be-BY
+Language=as
 Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/be-BY/sdraw.cfg b/helpcontent2/source/auxiliary/as/sdraw.cfg
index 06cdfe4df6..fb1d7e397b 100755..100644
--- a/helpcontent2/source/auxiliary/be-BY/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/as/sdraw.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Draw
 
-Language=be-BY
+Language=as
 Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/be-BY/simpress.cfg b/helpcontent2/source/auxiliary/as/simpress.cfg
index 15e588557e..c77a01456c 100755..100644
--- a/helpcontent2/source/auxiliary/be-BY/simpress.cfg
+++ b/helpcontent2/source/auxiliary/as/simpress.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Impress
 
-Language=be-BY
+Language=as
 Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/be-BY/smath.cfg b/helpcontent2/source/auxiliary/as/smath.cfg
index e140730814..0cc5118156 100755..100644
--- a/helpcontent2/source/auxiliary/be-BY/smath.cfg
+++ b/helpcontent2/source/auxiliary/as/smath.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Math
 
-Language=be-BY
+Language=as
 Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/be-BY/swriter.cfg b/helpcontent2/source/auxiliary/as/swriter.cfg
index e0977c6505..d6fc295aa6 100755..100644
--- a/helpcontent2/source/auxiliary/be-BY/swriter.cfg
+++ b/helpcontent2/source/auxiliary/as/swriter.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Writer
 
-Language=be-BY
+Language=as
 Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ast/default.css b/helpcontent2/source/auxiliary/ast/default.css
new file mode 100644
index 0000000000..bcdc5f4e61
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ast/default.css
@@ -0,0 +1,73 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                          DEFAULT STYLESHEET                       +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold; }
+
+.related
+	{ font-weight: bold; margin-top:20pt; border-top: 1px solid black;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; border: 1px solid #999999; background: #FFFFFF; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; margin-top: 2px; margin-bottom: 2px;}
+
+h1
+	{ font-size: 18pt; border-bottom: 1px solid black; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.howtoget
+	{ background:#EEEEEE;}
+
+.howtogetbody
+	{ background:#EEEEEE; margin: 0px;}
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+.debug
+	{ border: 1px solid black; padding: 3px; display: none;}
diff --git a/helpcontent2/source/auxiliary/ast/highcontrast1.css b/helpcontent2/source/auxiliary/ast/highcontrast1.css
new file mode 100644
index 0000000000..1b44518acd
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ast/highcontrast1.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #1 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFF00;}
+
+.related 
+	{ border-top: 1px solid #FFFF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/ast/highcontrast2.css b/helpcontent2/source/auxiliary/ast/highcontrast2.css
new file mode 100644
index 0000000000..6f934a4196
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ast/highcontrast2.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #2 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #00FF00;}
+
+.related 
+	{ border-top: 1px solid #00FF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #00FF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #00FF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/ast/highcontrastblack.css b/helpcontent2/source/auxiliary/ast/highcontrastblack.css
new file mode 100644
index 0000000000..87c4b7e310
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ast/highcontrastblack.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST BLACK STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFFFF;}
+
+.related 
+	{ border-top: 1px solid #FFFFFF; }
+
+.howtogetheader
+	{border: 1px solid #FFFFFF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFFFF; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFFFF; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/ast/highcontrastwhite.css b/helpcontent2/source/auxiliary/ast/highcontrastwhite.css
new file mode 100644
index 0000000000..9c8bbe469e
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ast/highcontrastwhite.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST WHITE STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #FFFFFF; color: #000000;}
+
+.related 
+	{ border-top: 1px solid #000000; }
+
+.howtogetheader
+	{border: 1px solid #000000; background: #FFFFFF;}
+
+h1 
+	{ border-bottom: 1px solid #000000; ]
+
+.howtoget
+	{ background:#FFFFFF;}
+
+.howtogetbody
+	{ background:#FFFFFF;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #000000; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/ast/sbasic.cfg b/helpcontent2/source/auxiliary/ast/sbasic.cfg
new file mode 100644
index 0000000000..22702dacd8
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ast/sbasic.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Basic
+
+Language=ast
+Order=7
+Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
+Heading=headingheading
+Program=BASIC 
diff --git a/helpcontent2/source/auxiliary/ast/scalc.cfg b/helpcontent2/source/auxiliary/ast/scalc.cfg
new file mode 100644
index 0000000000..5cd6276cf6
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ast/scalc.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Calc
+
+Language=ast
+Order=3
+Start=text%2Fscalc%2Fmain0000.xhp
+Heading=headingheading
+Program=CALC
diff --git a/helpcontent2/source/auxiliary/ast/schart.cfg b/helpcontent2/source/auxiliary/ast/schart.cfg
new file mode 100644
index 0000000000..597a5ff0cb
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ast/schart.cfg
@@ -0,0 +1,8 @@
+Title=%PRODUCTNAME Chart
+
+Language=ast
+Order=4
+Start=text%2Fschart%2Fmain0000.xhp
+Heading=headingheading
+Program=CHART
+
diff --git a/helpcontent2/source/auxiliary/ast/sdatabase.cfg b/helpcontent2/source/auxiliary/ast/sdatabase.cfg
new file mode 100644
index 0000000000..bc7e7cb293
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ast/sdatabase.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Base
+
+Language=ast
+Order=7
+Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
+Heading=headingheading
+Program=DATABASE 
diff --git a/helpcontent2/source/auxiliary/ast/sdraw.cfg b/helpcontent2/source/auxiliary/ast/sdraw.cfg
new file mode 100644
index 0000000000..8e8bac9346
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ast/sdraw.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Draw
+
+Language=ast
+Order=4
+Start=text%2Fsdraw%2Fmain0000.xhp
+Heading=headingheading
+Program=DRAW
diff --git a/helpcontent2/source/auxiliary/ast/simpress.cfg b/helpcontent2/source/auxiliary/ast/simpress.cfg
new file mode 100644
index 0000000000..e48ddf2afc
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ast/simpress.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Impress
+
+Language=ast
+Order=5
+Start=text%2Fsimpress%2Fmain0000.xhp
+Heading=headingheading
+Program=IMPRESS
diff --git a/helpcontent2/source/auxiliary/ast/smath.cfg b/helpcontent2/source/auxiliary/ast/smath.cfg
new file mode 100644
index 0000000000..65b914c3a3
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ast/smath.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Math
+
+Language=ast
+Order=6
+Start=text%2Fsmath%2Fmain0000.xhp
+Heading=headingheading
+Program=MATH
diff --git a/helpcontent2/source/auxiliary/ast/swriter.cfg b/helpcontent2/source/auxiliary/ast/swriter.cfg
new file mode 100644
index 0000000000..aff08f6532
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ast/swriter.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Writer
+
+Language=ast
+Order=2
+Start=text%2Fswriter%2Fmain0000.xhp
+Heading=headingheading
+Program=WRITER
diff --git a/helpcontent2/source/auxiliary/be/default.css b/helpcontent2/source/auxiliary/be/default.css
new file mode 100644
index 0000000000..bcdc5f4e61
--- /dev/null
+++ b/helpcontent2/source/auxiliary/be/default.css
@@ -0,0 +1,73 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                          DEFAULT STYLESHEET                       +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold; }
+
+.related
+	{ font-weight: bold; margin-top:20pt; border-top: 1px solid black;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; border: 1px solid #999999; background: #FFFFFF; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; margin-top: 2px; margin-bottom: 2px;}
+
+h1
+	{ font-size: 18pt; border-bottom: 1px solid black; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.howtoget
+	{ background:#EEEEEE;}
+
+.howtogetbody
+	{ background:#EEEEEE; margin: 0px;}
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+.debug
+	{ border: 1px solid black; padding: 3px; display: none;}
diff --git a/helpcontent2/source/auxiliary/be/highcontrast1.css b/helpcontent2/source/auxiliary/be/highcontrast1.css
new file mode 100644
index 0000000000..1b44518acd
--- /dev/null
+++ b/helpcontent2/source/auxiliary/be/highcontrast1.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #1 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFF00;}
+
+.related 
+	{ border-top: 1px solid #FFFF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/be/highcontrast2.css b/helpcontent2/source/auxiliary/be/highcontrast2.css
new file mode 100644
index 0000000000..6f934a4196
--- /dev/null
+++ b/helpcontent2/source/auxiliary/be/highcontrast2.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #2 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #00FF00;}
+
+.related 
+	{ border-top: 1px solid #00FF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #00FF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #00FF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/be/highcontrastblack.css b/helpcontent2/source/auxiliary/be/highcontrastblack.css
new file mode 100644
index 0000000000..87c4b7e310
--- /dev/null
+++ b/helpcontent2/source/auxiliary/be/highcontrastblack.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST BLACK STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFFFF;}
+
+.related 
+	{ border-top: 1px solid #FFFFFF; }
+
+.howtogetheader
+	{border: 1px solid #FFFFFF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFFFF; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFFFF; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/be/highcontrastwhite.css b/helpcontent2/source/auxiliary/be/highcontrastwhite.css
new file mode 100644
index 0000000000..9c8bbe469e
--- /dev/null
+++ b/helpcontent2/source/auxiliary/be/highcontrastwhite.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST WHITE STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #FFFFFF; color: #000000;}
+
+.related 
+	{ border-top: 1px solid #000000; }
+
+.howtogetheader
+	{border: 1px solid #000000; background: #FFFFFF;}
+
+h1 
+	{ border-bottom: 1px solid #000000; ]
+
+.howtoget
+	{ background:#FFFFFF;}
+
+.howtogetbody
+	{ background:#FFFFFF;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #000000; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/be/sbasic.cfg b/helpcontent2/source/auxiliary/be/sbasic.cfg
new file mode 100644
index 0000000000..d75a1fdfae
--- /dev/null
+++ b/helpcontent2/source/auxiliary/be/sbasic.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Basic
+
+Language=be
+Order=7
+Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
+Heading=headingheading
+Program=BASIC 
diff --git a/helpcontent2/source/auxiliary/be/scalc.cfg b/helpcontent2/source/auxiliary/be/scalc.cfg
new file mode 100644
index 0000000000..e33adf3db8
--- /dev/null
+++ b/helpcontent2/source/auxiliary/be/scalc.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Calc
+
+Language=be
+Order=3
+Start=text%2Fscalc%2Fmain0000.xhp
+Heading=headingheading
+Program=CALC
diff --git a/helpcontent2/source/auxiliary/be/schart.cfg b/helpcontent2/source/auxiliary/be/schart.cfg
new file mode 100644
index 0000000000..1ad4d477ab
--- /dev/null
+++ b/helpcontent2/source/auxiliary/be/schart.cfg
@@ -0,0 +1,8 @@
+Title=%PRODUCTNAME Chart
+
+Language=be
+Order=4
+Start=text%2Fschart%2Fmain0000.xhp
+Heading=headingheading
+Program=CHART
+
diff --git a/helpcontent2/source/auxiliary/be/sdatabase.cfg b/helpcontent2/source/auxiliary/be/sdatabase.cfg
new file mode 100644
index 0000000000..a618446947
--- /dev/null
+++ b/helpcontent2/source/auxiliary/be/sdatabase.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Base
+
+Language=be
+Order=7
+Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
+Heading=headingheading
+Program=DATABASE 
diff --git a/helpcontent2/source/auxiliary/be/sdraw.cfg b/helpcontent2/source/auxiliary/be/sdraw.cfg
new file mode 100644
index 0000000000..0a9b0edc5c
--- /dev/null
+++ b/helpcontent2/source/auxiliary/be/sdraw.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Draw
+
+Language=be
+Order=4
+Start=text%2Fsdraw%2Fmain0000.xhp
+Heading=headingheading
+Program=DRAW
diff --git a/helpcontent2/source/auxiliary/be/simpress.cfg b/helpcontent2/source/auxiliary/be/simpress.cfg
new file mode 100644
index 0000000000..c954ff70c5
--- /dev/null
+++ b/helpcontent2/source/auxiliary/be/simpress.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Impress
+
+Language=be
+Order=5
+Start=text%2Fsimpress%2Fmain0000.xhp
+Heading=headingheading
+Program=IMPRESS
diff --git a/helpcontent2/source/auxiliary/be/smath.cfg b/helpcontent2/source/auxiliary/be/smath.cfg
new file mode 100644
index 0000000000..2caec386c6
--- /dev/null
+++ b/helpcontent2/source/auxiliary/be/smath.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Math
+
+Language=be
+Order=6
+Start=text%2Fsmath%2Fmain0000.xhp
+Heading=headingheading
+Program=MATH
diff --git a/helpcontent2/source/auxiliary/be/swriter.cfg b/helpcontent2/source/auxiliary/be/swriter.cfg
new file mode 100644
index 0000000000..febdc7512f
--- /dev/null
+++ b/helpcontent2/source/auxiliary/be/swriter.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Writer
+
+Language=be
+Order=2
+Start=text%2Fswriter%2Fmain0000.xhp
+Heading=headingheading
+Program=WRITER
diff --git a/helpcontent2/source/auxiliary/bg/default.css b/helpcontent2/source/auxiliary/bg/default.css
index ebc386f7ac..a9d1afa3c1 100755..100644
--- a/helpcontent2/source/auxiliary/bg/default.css
+++ b/helpcontent2/source/auxiliary/bg/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,Helvetica,Lucida,Geneva,"Bitstream Vera Sans",Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,"Bitstream Vera Sans",Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New",Courier,"Bitstream Vera Sans Mono","Lucida Sans Typewriter","Lucida Typewriter",Monospaced,Monaco,Cumberland; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Bitstream Vera Sans Mono","Lucida Sans Typewriter","Lucida Typewriter",Monospaced,Monaco,Cumberland; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/bg/highcontrast1.css b/helpcontent2/source/auxiliary/bg/highcontrast1.css
index 4dac4e7315..3b9aeb80fa 100755..100644
--- a/helpcontent2/source/auxiliary/bg/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/bg/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,Helvetica,Lucida,Geneva,"Bitstream Vera Sans",Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,"Bitstream Vera Sans",Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New",Courier,"Bitstream Vera Sans Mono","Lucida Sans Typewriter","Lucida Typewriter",Monospaced,Monaco,Cumberland; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Bitstream Vera Sans Mono","Lucida Sans Typewriter","Lucida Typewriter",Monospaced,Monaco,Cumberland; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/bg/highcontrast2.css b/helpcontent2/source/auxiliary/bg/highcontrast2.css
index f425176059..6c38ae8ce4 100755..100644
--- a/helpcontent2/source/auxiliary/bg/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/bg/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,Helvetica,Lucida,Geneva,"Bitstream Vera Sans",Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,"Bitstream Vera Sans",Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New",Courier,"Bitstream Vera Sans Mono","Lucida Sans Typewriter","Lucida Typewriter",Monospaced,Monaco,Cumberland; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Bitstream Vera Sans Mono","Lucida Sans Typewriter","Lucida Typewriter",Monospaced,Monaco,Cumberland; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/bg/highcontrastblack.css b/helpcontent2/source/auxiliary/bg/highcontrastblack.css
index 4e4eeddc92..9415ef8c2c 100755..100644
--- a/helpcontent2/source/auxiliary/bg/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/bg/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,Helvetica,Lucida,Geneva,"Bitstream Vera Sans",Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,"Bitstream Vera Sans",Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New",Courier,"Bitstream Vera Sans Mono","Lucida Sans Typewriter","Lucida Typewriter",Monospaced,Monaco,Cumberland; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Bitstream Vera Sans Mono","Lucida Sans Typewriter","Lucida Typewriter",Monospaced,Monaco,Cumberland; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/bg/highcontrastwhite.css b/helpcontent2/source/auxiliary/bg/highcontrastwhite.css
index 88e5a50972..336ca3fde2 100755..100644
--- a/helpcontent2/source/auxiliary/bg/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/bg/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,Helvetica,Lucida,Geneva,"Bitstream Vera Sans",Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,"Bitstream Vera Sans",Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New",Courier,"Bitstream Vera Sans Mono","Lucida Sans Typewriter","Lucida Typewriter",Monospaced,Monaco,Cumberland; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Bitstream Vera Sans Mono","Lucida Sans Typewriter","Lucida Typewriter",Monospaced,Monaco,Cumberland; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/bg/sbasic.cfg b/helpcontent2/source/auxiliary/bg/sbasic.cfg
index fdf47dbc59..41dced5906 100755..100644
--- a/helpcontent2/source/auxiliary/bg/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/bg/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/bg/scalc.cfg b/helpcontent2/source/auxiliary/bg/scalc.cfg
index b688f625b9..dcb187b13f 100755..100644
--- a/helpcontent2/source/auxiliary/bg/scalc.cfg
+++ b/helpcontent2/source/auxiliary/bg/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/bg/schart.cfg b/helpcontent2/source/auxiliary/bg/schart.cfg
index ede921e3ac..1d3baa67c8 100755..100644
--- a/helpcontent2/source/auxiliary/bg/schart.cfg
+++ b/helpcontent2/source/auxiliary/bg/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/bg/sdatabase.cfg b/helpcontent2/source/auxiliary/bg/sdatabase.cfg
index 3e80b898de..f242f27992 100644
--- a/helpcontent2/source/auxiliary/bg/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/bg/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/bg/sdraw.cfg b/helpcontent2/source/auxiliary/bg/sdraw.cfg
index 141aaab6bd..4f235611f0 100755..100644
--- a/helpcontent2/source/auxiliary/bg/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/bg/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/bg/simpress.cfg b/helpcontent2/source/auxiliary/bg/simpress.cfg
index 1074dc958e..fe0bfd850b 100755..100644
--- a/helpcontent2/source/auxiliary/bg/simpress.cfg
+++ b/helpcontent2/source/auxiliary/bg/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/bg/smath.cfg b/helpcontent2/source/auxiliary/bg/smath.cfg
index 0cbb62deb2..73ebce50f3 100755..100644
--- a/helpcontent2/source/auxiliary/bg/smath.cfg
+++ b/helpcontent2/source/auxiliary/bg/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/bg/swriter.cfg b/helpcontent2/source/auxiliary/bg/swriter.cfg
index af13a44e86..e4c1290772 100755..100644
--- a/helpcontent2/source/auxiliary/bg/swriter.cfg
+++ b/helpcontent2/source/auxiliary/bg/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/bn/default.css b/helpcontent2/source/auxiliary/bn/default.css
index 16b38e6889..aba9c493e1 100755..100644
--- a/helpcontent2/source/auxiliary/bn/default.css
+++ b/helpcontent2/source/auxiliary/bn/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Mukti,MuktiNarrow,SolaimanLipi,"Lohit Bengali",Vrinda,"Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: Mukti,MuktiNarrow,SolaimanLipi,"Lohit Bengali",Vrinda,"Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: Mukti,MuktiNarrow,SolaimanLipi,"Lohit Bengali",Vrinda,"Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: Mukti,MuktiNarrow,SolaimanLipi,"Lohit Bengali",Vrinda,"Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/bn/highcontrast1.css b/helpcontent2/source/auxiliary/bn/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/bn/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/bn/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/bn/highcontrast2.css b/helpcontent2/source/auxiliary/bn/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/bn/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/bn/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/bn/highcontrastblack.css b/helpcontent2/source/auxiliary/bn/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/bn/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/bn/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/bn/highcontrastwhite.css b/helpcontent2/source/auxiliary/bn/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/bn/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/bn/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/bn/sbasic.cfg b/helpcontent2/source/auxiliary/bn/sbasic.cfg
index fa5b61ba7c..713845a843 100755..100644
--- a/helpcontent2/source/auxiliary/bn/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/bn/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/bn/scalc.cfg b/helpcontent2/source/auxiliary/bn/scalc.cfg
index 2485f72e32..7f16ba0ff1 100755..100644
--- a/helpcontent2/source/auxiliary/bn/scalc.cfg
+++ b/helpcontent2/source/auxiliary/bn/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/bn/schart.cfg b/helpcontent2/source/auxiliary/bn/schart.cfg
index 914b4beac1..789223e091 100755..100644
--- a/helpcontent2/source/auxiliary/bn/schart.cfg
+++ b/helpcontent2/source/auxiliary/bn/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/bn/sdatabase.cfg b/helpcontent2/source/auxiliary/bn/sdatabase.cfg
index c7fe73159d..a512505e25 100644
--- a/helpcontent2/source/auxiliary/bn/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/bn/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/bn/sdraw.cfg b/helpcontent2/source/auxiliary/bn/sdraw.cfg
index 19df0093b6..3453d2cf34 100755..100644
--- a/helpcontent2/source/auxiliary/bn/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/bn/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/bn/simpress.cfg b/helpcontent2/source/auxiliary/bn/simpress.cfg
index a687a1fe5e..e5e97900f8 100755..100644
--- a/helpcontent2/source/auxiliary/bn/simpress.cfg
+++ b/helpcontent2/source/auxiliary/bn/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/bn/smath.cfg b/helpcontent2/source/auxiliary/bn/smath.cfg
index e5b5f2c473..30b24700d4 100755..100644
--- a/helpcontent2/source/auxiliary/bn/smath.cfg
+++ b/helpcontent2/source/auxiliary/bn/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/bn/swriter.cfg b/helpcontent2/source/auxiliary/bn/swriter.cfg
index 72c3bb4fe6..037946ac3c 100755..100644
--- a/helpcontent2/source/auxiliary/bn/swriter.cfg
+++ b/helpcontent2/source/auxiliary/bn/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/bo/default.css b/helpcontent2/source/auxiliary/bo/default.css
new file mode 100644
index 0000000000..bcdc5f4e61
--- /dev/null
+++ b/helpcontent2/source/auxiliary/bo/default.css
@@ -0,0 +1,73 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                          DEFAULT STYLESHEET                       +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold; }
+
+.related
+	{ font-weight: bold; margin-top:20pt; border-top: 1px solid black;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; border: 1px solid #999999; background: #FFFFFF; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; margin-top: 2px; margin-bottom: 2px;}
+
+h1
+	{ font-size: 18pt; border-bottom: 1px solid black; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.howtoget
+	{ background:#EEEEEE;}
+
+.howtogetbody
+	{ background:#EEEEEE; margin: 0px;}
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+.debug
+	{ border: 1px solid black; padding: 3px; display: none;}
diff --git a/helpcontent2/source/auxiliary/bo/highcontrast1.css b/helpcontent2/source/auxiliary/bo/highcontrast1.css
new file mode 100644
index 0000000000..1b44518acd
--- /dev/null
+++ b/helpcontent2/source/auxiliary/bo/highcontrast1.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #1 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFF00;}
+
+.related 
+	{ border-top: 1px solid #FFFF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/bo/highcontrast2.css b/helpcontent2/source/auxiliary/bo/highcontrast2.css
new file mode 100644
index 0000000000..6f934a4196
--- /dev/null
+++ b/helpcontent2/source/auxiliary/bo/highcontrast2.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #2 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #00FF00;}
+
+.related 
+	{ border-top: 1px solid #00FF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #00FF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #00FF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/bo/highcontrastblack.css b/helpcontent2/source/auxiliary/bo/highcontrastblack.css
new file mode 100644
index 0000000000..87c4b7e310
--- /dev/null
+++ b/helpcontent2/source/auxiliary/bo/highcontrastblack.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST BLACK STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFFFF;}
+
+.related 
+	{ border-top: 1px solid #FFFFFF; }
+
+.howtogetheader
+	{border: 1px solid #FFFFFF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFFFF; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFFFF; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/bo/highcontrastwhite.css b/helpcontent2/source/auxiliary/bo/highcontrastwhite.css
new file mode 100644
index 0000000000..9c8bbe469e
--- /dev/null
+++ b/helpcontent2/source/auxiliary/bo/highcontrastwhite.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST WHITE STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #FFFFFF; color: #000000;}
+
+.related 
+	{ border-top: 1px solid #000000; }
+
+.howtogetheader
+	{border: 1px solid #000000; background: #FFFFFF;}
+
+h1 
+	{ border-bottom: 1px solid #000000; ]
+
+.howtoget
+	{ background:#FFFFFF;}
+
+.howtogetbody
+	{ background:#FFFFFF;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #000000; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/bo/sbasic.cfg b/helpcontent2/source/auxiliary/bo/sbasic.cfg
new file mode 100644
index 0000000000..dafa4331f8
--- /dev/null
+++ b/helpcontent2/source/auxiliary/bo/sbasic.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Basic
+
+Language=bo
+Order=7
+Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
+Heading=headingheading
+Program=BASIC 
diff --git a/helpcontent2/source/auxiliary/bo/scalc.cfg b/helpcontent2/source/auxiliary/bo/scalc.cfg
new file mode 100644
index 0000000000..3fdf90b25b
--- /dev/null
+++ b/helpcontent2/source/auxiliary/bo/scalc.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Calc
+
+Language=bo
+Order=3
+Start=text%2Fscalc%2Fmain0000.xhp
+Heading=headingheading
+Program=CALC
diff --git a/helpcontent2/source/auxiliary/bo/schart.cfg b/helpcontent2/source/auxiliary/bo/schart.cfg
new file mode 100644
index 0000000000..1f78bdb6f7
--- /dev/null
+++ b/helpcontent2/source/auxiliary/bo/schart.cfg
@@ -0,0 +1,8 @@
+Title=%PRODUCTNAME Chart
+
+Language=bo
+Order=4
+Start=text%2Fschart%2Fmain0000.xhp
+Heading=headingheading
+Program=CHART
+
diff --git a/helpcontent2/source/auxiliary/bo/sdatabase.cfg b/helpcontent2/source/auxiliary/bo/sdatabase.cfg
new file mode 100644
index 0000000000..f8e3b76943
--- /dev/null
+++ b/helpcontent2/source/auxiliary/bo/sdatabase.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Base
+
+Language=bo
+Order=7
+Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
+Heading=headingheading
+Program=DATABASE 
diff --git a/helpcontent2/source/auxiliary/bo/sdraw.cfg b/helpcontent2/source/auxiliary/bo/sdraw.cfg
new file mode 100644
index 0000000000..da7b57aa53
--- /dev/null
+++ b/helpcontent2/source/auxiliary/bo/sdraw.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Draw
+
+Language=bo
+Order=4
+Start=text%2Fsdraw%2Fmain0000.xhp
+Heading=headingheading
+Program=DRAW
diff --git a/helpcontent2/source/auxiliary/bo/simpress.cfg b/helpcontent2/source/auxiliary/bo/simpress.cfg
new file mode 100644
index 0000000000..fff16195ce
--- /dev/null
+++ b/helpcontent2/source/auxiliary/bo/simpress.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Impress
+
+Language=bo
+Order=5
+Start=text%2Fsimpress%2Fmain0000.xhp
+Heading=headingheading
+Program=IMPRESS
diff --git a/helpcontent2/source/auxiliary/bo/smath.cfg b/helpcontent2/source/auxiliary/bo/smath.cfg
new file mode 100644
index 0000000000..638950ddc5
--- /dev/null
+++ b/helpcontent2/source/auxiliary/bo/smath.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Math
+
+Language=bo
+Order=6
+Start=text%2Fsmath%2Fmain0000.xhp
+Heading=headingheading
+Program=MATH
diff --git a/helpcontent2/source/auxiliary/bo/swriter.cfg b/helpcontent2/source/auxiliary/bo/swriter.cfg
new file mode 100644
index 0000000000..094bdf06b5
--- /dev/null
+++ b/helpcontent2/source/auxiliary/bo/swriter.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Writer
+
+Language=bo
+Order=2
+Start=text%2Fswriter%2Fmain0000.xhp
+Heading=headingheading
+Program=WRITER
diff --git a/helpcontent2/source/auxiliary/br/default.css b/helpcontent2/source/auxiliary/br/default.css
index ebc386f7ac..a9d1afa3c1 100755..100644
--- a/helpcontent2/source/auxiliary/br/default.css
+++ b/helpcontent2/source/auxiliary/br/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,Helvetica,Lucida,Geneva,"Bitstream Vera Sans",Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,"Bitstream Vera Sans",Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New",Courier,"Bitstream Vera Sans Mono","Lucida Sans Typewriter","Lucida Typewriter",Monospaced,Monaco,Cumberland; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Bitstream Vera Sans Mono","Lucida Sans Typewriter","Lucida Typewriter",Monospaced,Monaco,Cumberland; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/br/highcontrast1.css b/helpcontent2/source/auxiliary/br/highcontrast1.css
index 4dac4e7315..3b9aeb80fa 100755..100644
--- a/helpcontent2/source/auxiliary/br/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/br/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,Helvetica,Lucida,Geneva,"Bitstream Vera Sans",Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,"Bitstream Vera Sans",Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New",Courier,"Bitstream Vera Sans Mono","Lucida Sans Typewriter","Lucida Typewriter",Monospaced,Monaco,Cumberland; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Bitstream Vera Sans Mono","Lucida Sans Typewriter","Lucida Typewriter",Monospaced,Monaco,Cumberland; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/br/highcontrast2.css b/helpcontent2/source/auxiliary/br/highcontrast2.css
index f425176059..6c38ae8ce4 100755..100644
--- a/helpcontent2/source/auxiliary/br/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/br/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,Helvetica,Lucida,Geneva,"Bitstream Vera Sans",Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,"Bitstream Vera Sans",Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New",Courier,"Bitstream Vera Sans Mono","Lucida Sans Typewriter","Lucida Typewriter",Monospaced,Monaco,Cumberland; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Bitstream Vera Sans Mono","Lucida Sans Typewriter","Lucida Typewriter",Monospaced,Monaco,Cumberland; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/br/highcontrastblack.css b/helpcontent2/source/auxiliary/br/highcontrastblack.css
index 4e4eeddc92..9415ef8c2c 100755..100644
--- a/helpcontent2/source/auxiliary/br/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/br/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,Helvetica,Lucida,Geneva,"Bitstream Vera Sans",Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,"Bitstream Vera Sans",Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New",Courier,"Bitstream Vera Sans Mono","Lucida Sans Typewriter","Lucida Typewriter",Monospaced,Monaco,Cumberland; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Bitstream Vera Sans Mono","Lucida Sans Typewriter","Lucida Typewriter",Monospaced,Monaco,Cumberland; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/br/highcontrastwhite.css b/helpcontent2/source/auxiliary/br/highcontrastwhite.css
index 88e5a50972..336ca3fde2 100755..100644
--- a/helpcontent2/source/auxiliary/br/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/br/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,Helvetica,Lucida,Geneva,"Bitstream Vera Sans",Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,"Bitstream Vera Sans",Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New",Courier,"Bitstream Vera Sans Mono","Lucida Sans Typewriter","Lucida Typewriter",Monospaced,Monaco,Cumberland; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Bitstream Vera Sans Mono","Lucida Sans Typewriter","Lucida Typewriter",Monospaced,Monaco,Cumberland; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/br/sbasic.cfg b/helpcontent2/source/auxiliary/br/sbasic.cfg
index 459b247004..c7ffeaba49 100755..100644
--- a/helpcontent2/source/auxiliary/br/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/br/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/br/scalc.cfg b/helpcontent2/source/auxiliary/br/scalc.cfg
index e06d39dcd0..771e321347 100755..100644
--- a/helpcontent2/source/auxiliary/br/scalc.cfg
+++ b/helpcontent2/source/auxiliary/br/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/br/schart.cfg b/helpcontent2/source/auxiliary/br/schart.cfg
index 975860b63c..82f07c08bb 100755..100644
--- a/helpcontent2/source/auxiliary/br/schart.cfg
+++ b/helpcontent2/source/auxiliary/br/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/br/sdatabase.cfg b/helpcontent2/source/auxiliary/br/sdatabase.cfg
index e699295ca9..ad913edde4 100644
--- a/helpcontent2/source/auxiliary/br/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/br/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/br/sdraw.cfg b/helpcontent2/source/auxiliary/br/sdraw.cfg
index 2416159864..439a3a0eb3 100755..100644
--- a/helpcontent2/source/auxiliary/br/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/br/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/br/simpress.cfg b/helpcontent2/source/auxiliary/br/simpress.cfg
index 3cd785778e..5aa4c79ffa 100755..100644
--- a/helpcontent2/source/auxiliary/br/simpress.cfg
+++ b/helpcontent2/source/auxiliary/br/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/br/smath.cfg b/helpcontent2/source/auxiliary/br/smath.cfg
index 572368205a..130e65be63 100755..100644
--- a/helpcontent2/source/auxiliary/br/smath.cfg
+++ b/helpcontent2/source/auxiliary/br/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/br/swriter.cfg b/helpcontent2/source/auxiliary/br/swriter.cfg
index 2855a8dcd5..63ee119889 100755..100644
--- a/helpcontent2/source/auxiliary/br/swriter.cfg
+++ b/helpcontent2/source/auxiliary/br/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/brx/default.css b/helpcontent2/source/auxiliary/brx/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/brx/default.css
+++ b/helpcontent2/source/auxiliary/brx/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/brx/highcontrast1.css b/helpcontent2/source/auxiliary/brx/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/brx/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/brx/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/brx/highcontrast2.css b/helpcontent2/source/auxiliary/brx/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/brx/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/brx/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/brx/highcontrastblack.css b/helpcontent2/source/auxiliary/brx/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/brx/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/brx/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/brx/highcontrastwhite.css b/helpcontent2/source/auxiliary/brx/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/brx/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/brx/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/brx/sbasic.cfg b/helpcontent2/source/auxiliary/brx/sbasic.cfg
index 0223c5ccfc..0e136dbb56 100644
--- a/helpcontent2/source/auxiliary/brx/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/brx/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/brx/scalc.cfg b/helpcontent2/source/auxiliary/brx/scalc.cfg
index e497703b26..863cb39abd 100644
--- a/helpcontent2/source/auxiliary/brx/scalc.cfg
+++ b/helpcontent2/source/auxiliary/brx/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/brx/schart.cfg b/helpcontent2/source/auxiliary/brx/schart.cfg
index 23c21d6d86..df8f89a494 100644
--- a/helpcontent2/source/auxiliary/brx/schart.cfg
+++ b/helpcontent2/source/auxiliary/brx/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/brx/sdatabase.cfg b/helpcontent2/source/auxiliary/brx/sdatabase.cfg
index baa7595ea1..8a85f519e6 100644
--- a/helpcontent2/source/auxiliary/brx/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/brx/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/brx/sdraw.cfg b/helpcontent2/source/auxiliary/brx/sdraw.cfg
index 6dd04e92ac..60d743568c 100644
--- a/helpcontent2/source/auxiliary/brx/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/brx/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/brx/simpress.cfg b/helpcontent2/source/auxiliary/brx/simpress.cfg
index 81e7865b51..aa1d296fbc 100644
--- a/helpcontent2/source/auxiliary/brx/simpress.cfg
+++ b/helpcontent2/source/auxiliary/brx/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/brx/smath.cfg b/helpcontent2/source/auxiliary/brx/smath.cfg
index de5c0dfc8b..2730774b25 100644
--- a/helpcontent2/source/auxiliary/brx/smath.cfg
+++ b/helpcontent2/source/auxiliary/brx/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/brx/swriter.cfg b/helpcontent2/source/auxiliary/brx/swriter.cfg
index 155a9b84ae..b72f738688 100644
--- a/helpcontent2/source/auxiliary/brx/swriter.cfg
+++ b/helpcontent2/source/auxiliary/brx/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/bs/default.css b/helpcontent2/source/auxiliary/bs/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/bs/default.css
+++ b/helpcontent2/source/auxiliary/bs/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/bs/highcontrast1.css b/helpcontent2/source/auxiliary/bs/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/bs/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/bs/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/bs/highcontrast2.css b/helpcontent2/source/auxiliary/bs/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/bs/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/bs/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/bs/highcontrastblack.css b/helpcontent2/source/auxiliary/bs/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/bs/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/bs/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/bs/highcontrastwhite.css b/helpcontent2/source/auxiliary/bs/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/bs/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/bs/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/bs/sbasic.cfg b/helpcontent2/source/auxiliary/bs/sbasic.cfg
index 6fd69ff00d..0888e8b6ea 100755..100644
--- a/helpcontent2/source/auxiliary/bs/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/bs/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/bs/scalc.cfg b/helpcontent2/source/auxiliary/bs/scalc.cfg
index adcd27a00c..b0ad4c25aa 100755..100644
--- a/helpcontent2/source/auxiliary/bs/scalc.cfg
+++ b/helpcontent2/source/auxiliary/bs/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/bs/schart.cfg b/helpcontent2/source/auxiliary/bs/schart.cfg
index 7bad9109d9..21445da707 100755..100644
--- a/helpcontent2/source/auxiliary/bs/schart.cfg
+++ b/helpcontent2/source/auxiliary/bs/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/bs/sdatabase.cfg b/helpcontent2/source/auxiliary/bs/sdatabase.cfg
index 377f7cccda..f46f182f7b 100644
--- a/helpcontent2/source/auxiliary/bs/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/bs/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/bs/sdraw.cfg b/helpcontent2/source/auxiliary/bs/sdraw.cfg
index 6806d8e29d..b4b684fba9 100755..100644
--- a/helpcontent2/source/auxiliary/bs/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/bs/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/bs/simpress.cfg b/helpcontent2/source/auxiliary/bs/simpress.cfg
index 1bc02744b1..4ce7ebbffd 100755..100644
--- a/helpcontent2/source/auxiliary/bs/simpress.cfg
+++ b/helpcontent2/source/auxiliary/bs/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/bs/smath.cfg b/helpcontent2/source/auxiliary/bs/smath.cfg
index 3e593534e9..4f33b6b14d 100755..100644
--- a/helpcontent2/source/auxiliary/bs/smath.cfg
+++ b/helpcontent2/source/auxiliary/bs/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/bs/swriter.cfg b/helpcontent2/source/auxiliary/bs/swriter.cfg
index bac3687bea..d8ec23f57d 100755..100644
--- a/helpcontent2/source/auxiliary/bs/swriter.cfg
+++ b/helpcontent2/source/auxiliary/bs/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ca-XV/default.css b/helpcontent2/source/auxiliary/ca-XV/default.css
index 39c0e7c100..28ca685c53 100644
--- a/helpcontent2/source/auxiliary/ca-XV/default.css
+++ b/helpcontent2/source/auxiliary/ca-XV/default.css
@@ -29,10 +29,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
+	{ font-family: "Albany AMT",Albany,Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Cumberland,Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/ca-XV/highcontrast1.css b/helpcontent2/source/auxiliary/ca-XV/highcontrast1.css
index 7ab33fbbbb..750889d59a 100644
--- a/helpcontent2/source/auxiliary/ca-XV/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/ca-XV/highcontrast1.css
@@ -29,10 +29,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
+	{ font-family: "Albany AMT",Albany,Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Cumberland,Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ca-XV/highcontrast2.css b/helpcontent2/source/auxiliary/ca-XV/highcontrast2.css
index 930dfe9605..a539032262 100644
--- a/helpcontent2/source/auxiliary/ca-XV/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/ca-XV/highcontrast2.css
@@ -30,10 +30,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
+	{ font-family: "Albany AMT",Albany,Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Cumberland,Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ca-XV/highcontrastblack.css b/helpcontent2/source/auxiliary/ca-XV/highcontrastblack.css
index 63732b88ff..4a8537e5f2 100644
--- a/helpcontent2/source/auxiliary/ca-XV/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/ca-XV/highcontrastblack.css
@@ -30,10 +30,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
+	{ font-family: "Albany AMT",Albany,Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Cumberland,Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ca-XV/highcontrastwhite.css b/helpcontent2/source/auxiliary/ca-XV/highcontrastwhite.css
index e3743341a0..58d6f9eebd 100644
--- a/helpcontent2/source/auxiliary/ca-XV/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/ca-XV/highcontrastwhite.css
@@ -30,10 +30,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
+	{ font-family: "Albany AMT",Albany,Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Cumberland,Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ca-XV/sbasic.cfg b/helpcontent2/source/auxiliary/ca-XV/sbasic.cfg
index 0c08ecaa82..db6bbaf5c0 100644
--- a/helpcontent2/source/auxiliary/ca-XV/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/ca-XV/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ca-XV/scalc.cfg b/helpcontent2/source/auxiliary/ca-XV/scalc.cfg
index 64be5e3429..ad06ed890d 100644
--- a/helpcontent2/source/auxiliary/ca-XV/scalc.cfg
+++ b/helpcontent2/source/auxiliary/ca-XV/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ca-XV/schart.cfg b/helpcontent2/source/auxiliary/ca-XV/schart.cfg
index b3a51c307e..2d0fc4c7eb 100755..100644
--- a/helpcontent2/source/auxiliary/ca-XV/schart.cfg
+++ b/helpcontent2/source/auxiliary/ca-XV/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/ca-XV/sdatabase.cfg b/helpcontent2/source/auxiliary/ca-XV/sdatabase.cfg
index cdf369b046..30056984e5 100644
--- a/helpcontent2/source/auxiliary/ca-XV/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/ca-XV/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ca-XV/sdraw.cfg b/helpcontent2/source/auxiliary/ca-XV/sdraw.cfg
index 4c83b7101d..18fe21aefc 100644
--- a/helpcontent2/source/auxiliary/ca-XV/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/ca-XV/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ca-XV/simpress.cfg b/helpcontent2/source/auxiliary/ca-XV/simpress.cfg
index 60266fd73a..cc172a027e 100644
--- a/helpcontent2/source/auxiliary/ca-XV/simpress.cfg
+++ b/helpcontent2/source/auxiliary/ca-XV/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ca-XV/smath.cfg b/helpcontent2/source/auxiliary/ca-XV/smath.cfg
index 5d2a39239b..7816f6f18c 100644
--- a/helpcontent2/source/auxiliary/ca-XV/smath.cfg
+++ b/helpcontent2/source/auxiliary/ca-XV/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ca-XV/swriter.cfg b/helpcontent2/source/auxiliary/ca-XV/swriter.cfg
index a77ad3f714..cb59488ac2 100644
--- a/helpcontent2/source/auxiliary/ca-XV/swriter.cfg
+++ b/helpcontent2/source/auxiliary/ca-XV/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ca/default.css b/helpcontent2/source/auxiliary/ca/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/ca/default.css
+++ b/helpcontent2/source/auxiliary/ca/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/ca/highcontrast1.css b/helpcontent2/source/auxiliary/ca/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/ca/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/ca/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ca/highcontrast2.css b/helpcontent2/source/auxiliary/ca/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/ca/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/ca/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ca/highcontrastblack.css b/helpcontent2/source/auxiliary/ca/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/ca/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/ca/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ca/highcontrastwhite.css b/helpcontent2/source/auxiliary/ca/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/ca/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/ca/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ca/sbasic.cfg b/helpcontent2/source/auxiliary/ca/sbasic.cfg
index f581711f9d..b3f09bfca0 100755..100644
--- a/helpcontent2/source/auxiliary/ca/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/ca/sbasic.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Basic
 
-Language=en-US
+Language=ca
 Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ca/scalc.cfg b/helpcontent2/source/auxiliary/ca/scalc.cfg
index d9d7962f2d..ec0a283495 100755..100644
--- a/helpcontent2/source/auxiliary/ca/scalc.cfg
+++ b/helpcontent2/source/auxiliary/ca/scalc.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Calc
 
-Language=en-US
+Language=ca
 Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ca/schart.cfg b/helpcontent2/source/auxiliary/ca/schart.cfg
index 5ab122f0d4..46ca1e09ba 100755..100644
--- a/helpcontent2/source/auxiliary/ca/schart.cfg
+++ b/helpcontent2/source/auxiliary/ca/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/ca/sdatabase.cfg b/helpcontent2/source/auxiliary/ca/sdatabase.cfg
index 859bbdce98..8155923b59 100644
--- a/helpcontent2/source/auxiliary/ca/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/ca/sdatabase.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Base
 
-Language=en-US
+Language=ca
 Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ca/sdraw.cfg b/helpcontent2/source/auxiliary/ca/sdraw.cfg
index 81119c21af..e2fc3b3da1 100755..100644
--- a/helpcontent2/source/auxiliary/ca/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/ca/sdraw.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Draw
 
-Language=en-US
+Language=ca
 Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ca/simpress.cfg b/helpcontent2/source/auxiliary/ca/simpress.cfg
index 827da159a8..1adc238b2f 100755..100644
--- a/helpcontent2/source/auxiliary/ca/simpress.cfg
+++ b/helpcontent2/source/auxiliary/ca/simpress.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Impress
 
-Language=en-US
+Language=ca
 Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ca/smath.cfg b/helpcontent2/source/auxiliary/ca/smath.cfg
index 53966b5f04..b0a6c2917a 100755..100644
--- a/helpcontent2/source/auxiliary/ca/smath.cfg
+++ b/helpcontent2/source/auxiliary/ca/smath.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Math
 
-Language=en-US
+Language=ca
 Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ca/swriter.cfg b/helpcontent2/source/auxiliary/ca/swriter.cfg
index 5d3baaaad3..2b87d86def 100755..100644
--- a/helpcontent2/source/auxiliary/ca/swriter.cfg
+++ b/helpcontent2/source/auxiliary/ca/swriter.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Writer
 
-Language=en-US
+Language=ca
 Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/cs/default.css b/helpcontent2/source/auxiliary/cs/default.css
index b67f98d9b4..a1c6590831 100755..100644
--- a/helpcontent2/source/auxiliary/cs/default.css
+++ b/helpcontent2/source/auxiliary/cs/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/cs/highcontrast1.css b/helpcontent2/source/auxiliary/cs/highcontrast1.css
index a94f7f61bc..11860c0592 100755..100644
--- a/helpcontent2/source/auxiliary/cs/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/cs/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/cs/highcontrast2.css b/helpcontent2/source/auxiliary/cs/highcontrast2.css
index 79a5e37788..fbd036b564 100755..100644
--- a/helpcontent2/source/auxiliary/cs/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/cs/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/cs/highcontrastblack.css b/helpcontent2/source/auxiliary/cs/highcontrastblack.css
index b65e0ef005..29dd2c4614 100755..100644
--- a/helpcontent2/source/auxiliary/cs/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/cs/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/cs/highcontrastwhite.css b/helpcontent2/source/auxiliary/cs/highcontrastwhite.css
index ba6e13dada..89ad66c9e1 100755..100644
--- a/helpcontent2/source/auxiliary/cs/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/cs/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/cs/sbasic.cfg b/helpcontent2/source/auxiliary/cs/sbasic.cfg
index 75b23bd1e1..dcc3cb6efb 100755..100644
--- a/helpcontent2/source/auxiliary/cs/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/cs/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/cs/scalc.cfg b/helpcontent2/source/auxiliary/cs/scalc.cfg
index 3de7324b2a..e1c0b6c030 100755..100644
--- a/helpcontent2/source/auxiliary/cs/scalc.cfg
+++ b/helpcontent2/source/auxiliary/cs/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/cs/schart.cfg b/helpcontent2/source/auxiliary/cs/schart.cfg
index fcb2046416..3274278325 100755..100644
--- a/helpcontent2/source/auxiliary/cs/schart.cfg
+++ b/helpcontent2/source/auxiliary/cs/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/cs/sdatabase.cfg b/helpcontent2/source/auxiliary/cs/sdatabase.cfg
index b7089c8a8d..6760a93e25 100644
--- a/helpcontent2/source/auxiliary/cs/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/cs/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/cs/sdraw.cfg b/helpcontent2/source/auxiliary/cs/sdraw.cfg
index 2504ce2918..0217d664fe 100755..100644
--- a/helpcontent2/source/auxiliary/cs/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/cs/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/cs/simpress.cfg b/helpcontent2/source/auxiliary/cs/simpress.cfg
index 1382f059d7..cd605ec769 100755..100644
--- a/helpcontent2/source/auxiliary/cs/simpress.cfg
+++ b/helpcontent2/source/auxiliary/cs/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/cs/smath.cfg b/helpcontent2/source/auxiliary/cs/smath.cfg
index ffb33c5930..b99f77a5b2 100755..100644
--- a/helpcontent2/source/auxiliary/cs/smath.cfg
+++ b/helpcontent2/source/auxiliary/cs/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/cs/swriter.cfg b/helpcontent2/source/auxiliary/cs/swriter.cfg
index 18670fc947..450d4c7533 100755..100644
--- a/helpcontent2/source/auxiliary/cs/swriter.cfg
+++ b/helpcontent2/source/auxiliary/cs/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/cy/default.css b/helpcontent2/source/auxiliary/cy/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/cy/default.css
+++ b/helpcontent2/source/auxiliary/cy/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/cy/highcontrast1.css b/helpcontent2/source/auxiliary/cy/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/cy/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/cy/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/cy/highcontrast2.css b/helpcontent2/source/auxiliary/cy/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/cy/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/cy/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/cy/highcontrastblack.css b/helpcontent2/source/auxiliary/cy/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/cy/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/cy/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/cy/highcontrastwhite.css b/helpcontent2/source/auxiliary/cy/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/cy/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/cy/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/cy/sbasic.cfg b/helpcontent2/source/auxiliary/cy/sbasic.cfg
index 87b3c06240..b65c455f0b 100755..100644
--- a/helpcontent2/source/auxiliary/cy/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/cy/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/cy/scalc.cfg b/helpcontent2/source/auxiliary/cy/scalc.cfg
index ec8a7418e8..89eb037a88 100755..100644
--- a/helpcontent2/source/auxiliary/cy/scalc.cfg
+++ b/helpcontent2/source/auxiliary/cy/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/cy/schart.cfg b/helpcontent2/source/auxiliary/cy/schart.cfg
index 2d7aa2501e..37da8eb67d 100755..100644
--- a/helpcontent2/source/auxiliary/cy/schart.cfg
+++ b/helpcontent2/source/auxiliary/cy/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/cy/sdatabase.cfg b/helpcontent2/source/auxiliary/cy/sdatabase.cfg
index 00d51a8d4a..4354407647 100644
--- a/helpcontent2/source/auxiliary/cy/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/cy/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/cy/sdraw.cfg b/helpcontent2/source/auxiliary/cy/sdraw.cfg
index fe306269e3..249e444481 100755..100644
--- a/helpcontent2/source/auxiliary/cy/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/cy/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/cy/simpress.cfg b/helpcontent2/source/auxiliary/cy/simpress.cfg
index 1c3623e3a3..3d059a29bb 100755..100644
--- a/helpcontent2/source/auxiliary/cy/simpress.cfg
+++ b/helpcontent2/source/auxiliary/cy/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/cy/smath.cfg b/helpcontent2/source/auxiliary/cy/smath.cfg
index 068dbe84b0..b0d483c08e 100755..100644
--- a/helpcontent2/source/auxiliary/cy/smath.cfg
+++ b/helpcontent2/source/auxiliary/cy/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/cy/swriter.cfg b/helpcontent2/source/auxiliary/cy/swriter.cfg
index 3cc5277dda..d7ad116b5b 100755..100644
--- a/helpcontent2/source/auxiliary/cy/swriter.cfg
+++ b/helpcontent2/source/auxiliary/cy/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/da/default.css b/helpcontent2/source/auxiliary/da/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/da/default.css
+++ b/helpcontent2/source/auxiliary/da/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/da/highcontrast1.css b/helpcontent2/source/auxiliary/da/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/da/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/da/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/da/highcontrast2.css b/helpcontent2/source/auxiliary/da/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/da/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/da/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/da/highcontrastblack.css b/helpcontent2/source/auxiliary/da/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/da/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/da/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/da/highcontrastwhite.css b/helpcontent2/source/auxiliary/da/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/da/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/da/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/da/sbasic.cfg b/helpcontent2/source/auxiliary/da/sbasic.cfg
index 8010e6086a..347db5c997 100755..100644
--- a/helpcontent2/source/auxiliary/da/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/da/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/da/scalc.cfg b/helpcontent2/source/auxiliary/da/scalc.cfg
index 647a7403a5..e104a79e94 100755..100644
--- a/helpcontent2/source/auxiliary/da/scalc.cfg
+++ b/helpcontent2/source/auxiliary/da/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/da/schart.cfg b/helpcontent2/source/auxiliary/da/schart.cfg
index 236fe3065c..78ca9e6fd1 100755..100644
--- a/helpcontent2/source/auxiliary/da/schart.cfg
+++ b/helpcontent2/source/auxiliary/da/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/da/sdatabase.cfg b/helpcontent2/source/auxiliary/da/sdatabase.cfg
index 8859066aec..958a687211 100644
--- a/helpcontent2/source/auxiliary/da/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/da/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/da/sdraw.cfg b/helpcontent2/source/auxiliary/da/sdraw.cfg
index 379fd382a0..272dd032a1 100755..100644
--- a/helpcontent2/source/auxiliary/da/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/da/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/da/simpress.cfg b/helpcontent2/source/auxiliary/da/simpress.cfg
index bcd06b6882..6b68635575 100755..100644
--- a/helpcontent2/source/auxiliary/da/simpress.cfg
+++ b/helpcontent2/source/auxiliary/da/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/da/smath.cfg b/helpcontent2/source/auxiliary/da/smath.cfg
index fd26f217d0..d6e47a92d5 100755..100644
--- a/helpcontent2/source/auxiliary/da/smath.cfg
+++ b/helpcontent2/source/auxiliary/da/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/da/swriter.cfg b/helpcontent2/source/auxiliary/da/swriter.cfg
index ec6d368861..8ff0bf93a3 100755..100644
--- a/helpcontent2/source/auxiliary/da/swriter.cfg
+++ b/helpcontent2/source/auxiliary/da/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/de/default.css b/helpcontent2/source/auxiliary/de/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/de/default.css
+++ b/helpcontent2/source/auxiliary/de/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/de/highcontrast1.css b/helpcontent2/source/auxiliary/de/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/de/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/de/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/de/highcontrast2.css b/helpcontent2/source/auxiliary/de/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/de/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/de/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/de/highcontrastblack.css b/helpcontent2/source/auxiliary/de/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/de/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/de/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/de/highcontrastwhite.css b/helpcontent2/source/auxiliary/de/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/de/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/de/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/de/sbasic.cfg b/helpcontent2/source/auxiliary/de/sbasic.cfg
index 3020a0393f..df663d8288 100755..100644
--- a/helpcontent2/source/auxiliary/de/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/de/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/de/scalc.cfg b/helpcontent2/source/auxiliary/de/scalc.cfg
index 6e74e6b119..599ed785b0 100755..100644
--- a/helpcontent2/source/auxiliary/de/scalc.cfg
+++ b/helpcontent2/source/auxiliary/de/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/de/schart.cfg b/helpcontent2/source/auxiliary/de/schart.cfg
index b86f38ca63..5d28755189 100755..100644
--- a/helpcontent2/source/auxiliary/de/schart.cfg
+++ b/helpcontent2/source/auxiliary/de/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/de/sdatabase.cfg b/helpcontent2/source/auxiliary/de/sdatabase.cfg
index e61f7ace1b..8fbc099446 100644
--- a/helpcontent2/source/auxiliary/de/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/de/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/de/sdraw.cfg b/helpcontent2/source/auxiliary/de/sdraw.cfg
index 7e6af32b88..d53e01f244 100755..100644
--- a/helpcontent2/source/auxiliary/de/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/de/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/de/simpress.cfg b/helpcontent2/source/auxiliary/de/simpress.cfg
index 60f5b78e5a..22151b70e8 100755..100644
--- a/helpcontent2/source/auxiliary/de/simpress.cfg
+++ b/helpcontent2/source/auxiliary/de/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/de/smath.cfg b/helpcontent2/source/auxiliary/de/smath.cfg
index e7bba233d1..3da4d58ad0 100755..100644
--- a/helpcontent2/source/auxiliary/de/smath.cfg
+++ b/helpcontent2/source/auxiliary/de/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/de/swriter.cfg b/helpcontent2/source/auxiliary/de/swriter.cfg
index fe3be63a62..5d330c23a0 100755..100644
--- a/helpcontent2/source/auxiliary/de/swriter.cfg
+++ b/helpcontent2/source/auxiliary/de/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/dgo/default.css b/helpcontent2/source/auxiliary/dgo/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/dgo/default.css
+++ b/helpcontent2/source/auxiliary/dgo/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/dgo/highcontrast1.css b/helpcontent2/source/auxiliary/dgo/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/dgo/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/dgo/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/dgo/highcontrast2.css b/helpcontent2/source/auxiliary/dgo/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/dgo/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/dgo/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/dgo/highcontrastblack.css b/helpcontent2/source/auxiliary/dgo/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/dgo/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/dgo/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/dgo/highcontrastwhite.css b/helpcontent2/source/auxiliary/dgo/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/dgo/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/dgo/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/dgo/sbasic.cfg b/helpcontent2/source/auxiliary/dgo/sbasic.cfg
index 8bb14ad0a4..5ee9d21068 100644
--- a/helpcontent2/source/auxiliary/dgo/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/dgo/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/dgo/scalc.cfg b/helpcontent2/source/auxiliary/dgo/scalc.cfg
index 4e58a193d6..8e0bfa5d5a 100644
--- a/helpcontent2/source/auxiliary/dgo/scalc.cfg
+++ b/helpcontent2/source/auxiliary/dgo/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/dgo/schart.cfg b/helpcontent2/source/auxiliary/dgo/schart.cfg
index 2e959a1b52..ad885152bb 100644
--- a/helpcontent2/source/auxiliary/dgo/schart.cfg
+++ b/helpcontent2/source/auxiliary/dgo/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/dgo/sdatabase.cfg b/helpcontent2/source/auxiliary/dgo/sdatabase.cfg
index ab72758e88..fae98ba437 100644
--- a/helpcontent2/source/auxiliary/dgo/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/dgo/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/dgo/sdraw.cfg b/helpcontent2/source/auxiliary/dgo/sdraw.cfg
index df0358ea81..92731d2470 100644
--- a/helpcontent2/source/auxiliary/dgo/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/dgo/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/dgo/simpress.cfg b/helpcontent2/source/auxiliary/dgo/simpress.cfg
index b036c85a35..fbed7ea391 100644
--- a/helpcontent2/source/auxiliary/dgo/simpress.cfg
+++ b/helpcontent2/source/auxiliary/dgo/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/dgo/smath.cfg b/helpcontent2/source/auxiliary/dgo/smath.cfg
index e912233abe..9ad02e70ba 100644
--- a/helpcontent2/source/auxiliary/dgo/smath.cfg
+++ b/helpcontent2/source/auxiliary/dgo/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/dgo/swriter.cfg b/helpcontent2/source/auxiliary/dgo/swriter.cfg
index 5e7d5ac8a4..547289c8c9 100644
--- a/helpcontent2/source/auxiliary/dgo/swriter.cfg
+++ b/helpcontent2/source/auxiliary/dgo/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/dz/default.css b/helpcontent2/source/auxiliary/dz/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/dz/default.css
+++ b/helpcontent2/source/auxiliary/dz/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/dz/highcontrast1.css b/helpcontent2/source/auxiliary/dz/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/dz/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/dz/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/dz/highcontrast2.css b/helpcontent2/source/auxiliary/dz/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/dz/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/dz/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/dz/highcontrastblack.css b/helpcontent2/source/auxiliary/dz/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/dz/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/dz/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/dz/highcontrastwhite.css b/helpcontent2/source/auxiliary/dz/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/dz/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/dz/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/dz/sbasic.cfg b/helpcontent2/source/auxiliary/dz/sbasic.cfg
index d0f6de0eb8..97414088cd 100755..100644
--- a/helpcontent2/source/auxiliary/dz/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/dz/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/dz/scalc.cfg b/helpcontent2/source/auxiliary/dz/scalc.cfg
index d29c493290..9fbade570c 100755..100644
--- a/helpcontent2/source/auxiliary/dz/scalc.cfg
+++ b/helpcontent2/source/auxiliary/dz/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/dz/schart.cfg b/helpcontent2/source/auxiliary/dz/schart.cfg
index 4e3ff0bee5..503729c19e 100755..100644
--- a/helpcontent2/source/auxiliary/dz/schart.cfg
+++ b/helpcontent2/source/auxiliary/dz/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/dz/sdatabase.cfg b/helpcontent2/source/auxiliary/dz/sdatabase.cfg
index da7b5c5bb8..68eb67fa90 100644
--- a/helpcontent2/source/auxiliary/dz/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/dz/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/dz/sdraw.cfg b/helpcontent2/source/auxiliary/dz/sdraw.cfg
index e20051156a..aad24f56e2 100755..100644
--- a/helpcontent2/source/auxiliary/dz/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/dz/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/dz/simpress.cfg b/helpcontent2/source/auxiliary/dz/simpress.cfg
index f3c0a1e3d6..dbf85a9c24 100755..100644
--- a/helpcontent2/source/auxiliary/dz/simpress.cfg
+++ b/helpcontent2/source/auxiliary/dz/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/dz/smath.cfg b/helpcontent2/source/auxiliary/dz/smath.cfg
index 8a70b2a996..3bf82b7a77 100755..100644
--- a/helpcontent2/source/auxiliary/dz/smath.cfg
+++ b/helpcontent2/source/auxiliary/dz/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/dz/swriter.cfg b/helpcontent2/source/auxiliary/dz/swriter.cfg
index befe07658a..924ab48c62 100755..100644
--- a/helpcontent2/source/auxiliary/dz/swriter.cfg
+++ b/helpcontent2/source/auxiliary/dz/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/el/default.css b/helpcontent2/source/auxiliary/el/default.css
index eb2b76fed3..eb2b76fed3 100755..100644
--- a/helpcontent2/source/auxiliary/el/default.css
+++ b/helpcontent2/source/auxiliary/el/default.css
diff --git a/helpcontent2/source/auxiliary/el/highcontrast1.css b/helpcontent2/source/auxiliary/el/highcontrast1.css
index 9ba22f0736..9ba22f0736 100755..100644
--- a/helpcontent2/source/auxiliary/el/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/el/highcontrast1.css
diff --git a/helpcontent2/source/auxiliary/el/highcontrast2.css b/helpcontent2/source/auxiliary/el/highcontrast2.css
index 4f9f22266e..4f9f22266e 100755..100644
--- a/helpcontent2/source/auxiliary/el/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/el/highcontrast2.css
diff --git a/helpcontent2/source/auxiliary/el/highcontrastblack.css b/helpcontent2/source/auxiliary/el/highcontrastblack.css
index 7e8eddf17f..7e8eddf17f 100755..100644
--- a/helpcontent2/source/auxiliary/el/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/el/highcontrastblack.css
diff --git a/helpcontent2/source/auxiliary/el/highcontrastwhite.css b/helpcontent2/source/auxiliary/el/highcontrastwhite.css
index 70e6e8a9d4..70e6e8a9d4 100755..100644
--- a/helpcontent2/source/auxiliary/el/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/el/highcontrastwhite.css
diff --git a/helpcontent2/source/auxiliary/el/sbasic.cfg b/helpcontent2/source/auxiliary/el/sbasic.cfg
index f02cae6662..1a0b852f7f 100755..100644
--- a/helpcontent2/source/auxiliary/el/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/el/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/el/scalc.cfg b/helpcontent2/source/auxiliary/el/scalc.cfg
index e480dd2b78..5eda5a88df 100755..100644
--- a/helpcontent2/source/auxiliary/el/scalc.cfg
+++ b/helpcontent2/source/auxiliary/el/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/el/schart.cfg b/helpcontent2/source/auxiliary/el/schart.cfg
index 310e841cb3..b7e05a5fdd 100755..100644
--- a/helpcontent2/source/auxiliary/el/schart.cfg
+++ b/helpcontent2/source/auxiliary/el/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/el/sdatabase.cfg b/helpcontent2/source/auxiliary/el/sdatabase.cfg
index 8b51b2f52e..631dfa5e84 100644
--- a/helpcontent2/source/auxiliary/el/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/el/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/el/sdraw.cfg b/helpcontent2/source/auxiliary/el/sdraw.cfg
index ce30656c91..d6b6cb158a 100755..100644
--- a/helpcontent2/source/auxiliary/el/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/el/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/el/simpress.cfg b/helpcontent2/source/auxiliary/el/simpress.cfg
index 7fc2314adc..26c26ef29c 100755..100644
--- a/helpcontent2/source/auxiliary/el/simpress.cfg
+++ b/helpcontent2/source/auxiliary/el/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/el/smath.cfg b/helpcontent2/source/auxiliary/el/smath.cfg
index a6a8120951..ff94e4d7ce 100755..100644
--- a/helpcontent2/source/auxiliary/el/smath.cfg
+++ b/helpcontent2/source/auxiliary/el/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/el/swriter.cfg b/helpcontent2/source/auxiliary/el/swriter.cfg
index 9e19b84f12..ae84c5b657 100755..100644
--- a/helpcontent2/source/auxiliary/el/swriter.cfg
+++ b/helpcontent2/source/auxiliary/el/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/en-GB/default.css b/helpcontent2/source/auxiliary/en-GB/default.css
index 2fa534688a..bcdc5f4e61 100644
--- a/helpcontent2/source/auxiliary/en-GB/default.css
+++ b/helpcontent2/source/auxiliary/en-GB/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/en-GB/highcontrast1.css b/helpcontent2/source/auxiliary/en-GB/highcontrast1.css
index 354c383724..1b44518acd 100644
--- a/helpcontent2/source/auxiliary/en-GB/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/en-GB/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/en-GB/highcontrast2.css b/helpcontent2/source/auxiliary/en-GB/highcontrast2.css
index ec2763dc2b..6f934a4196 100644
--- a/helpcontent2/source/auxiliary/en-GB/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/en-GB/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/en-GB/highcontrastblack.css b/helpcontent2/source/auxiliary/en-GB/highcontrastblack.css
index e782fd491c..87c4b7e310 100644
--- a/helpcontent2/source/auxiliary/en-GB/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/en-GB/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/en-GB/highcontrastwhite.css b/helpcontent2/source/auxiliary/en-GB/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100644
--- a/helpcontent2/source/auxiliary/en-GB/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/en-GB/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/en-GB/sbasic.cfg b/helpcontent2/source/auxiliary/en-GB/sbasic.cfg
index 1e572effd9..bea7c9daca 100644
--- a/helpcontent2/source/auxiliary/en-GB/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/en-GB/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/en-GB/scalc.cfg b/helpcontent2/source/auxiliary/en-GB/scalc.cfg
index 2b5923e6da..d38060f97e 100644
--- a/helpcontent2/source/auxiliary/en-GB/scalc.cfg
+++ b/helpcontent2/source/auxiliary/en-GB/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/en-GB/schart.cfg b/helpcontent2/source/auxiliary/en-GB/schart.cfg
index 1222abb247..8d55056f2c 100755..100644
--- a/helpcontent2/source/auxiliary/en-GB/schart.cfg
+++ b/helpcontent2/source/auxiliary/en-GB/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/en-GB/sdatabase.cfg b/helpcontent2/source/auxiliary/en-GB/sdatabase.cfg
index 6abdade1d2..ef8fb4cace 100644
--- a/helpcontent2/source/auxiliary/en-GB/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/en-GB/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/en-GB/sdraw.cfg b/helpcontent2/source/auxiliary/en-GB/sdraw.cfg
index 9b73095419..eb3e0f6d2e 100644
--- a/helpcontent2/source/auxiliary/en-GB/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/en-GB/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/en-GB/simpress.cfg b/helpcontent2/source/auxiliary/en-GB/simpress.cfg
index beaa9bb13f..7c2a081ba6 100644
--- a/helpcontent2/source/auxiliary/en-GB/simpress.cfg
+++ b/helpcontent2/source/auxiliary/en-GB/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/en-GB/smath.cfg b/helpcontent2/source/auxiliary/en-GB/smath.cfg
index bd454c46c6..318a2c9e52 100644
--- a/helpcontent2/source/auxiliary/en-GB/smath.cfg
+++ b/helpcontent2/source/auxiliary/en-GB/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/en-GB/swriter.cfg b/helpcontent2/source/auxiliary/en-GB/swriter.cfg
index 9655b97f45..00467f4bf7 100644
--- a/helpcontent2/source/auxiliary/en-GB/swriter.cfg
+++ b/helpcontent2/source/auxiliary/en-GB/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/en-US/default.css b/helpcontent2/source/auxiliary/en-US/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/en-US/default.css
+++ b/helpcontent2/source/auxiliary/en-US/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/en-US/highcontrast1.css b/helpcontent2/source/auxiliary/en-US/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/en-US/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/en-US/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/en-US/highcontrast2.css b/helpcontent2/source/auxiliary/en-US/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/en-US/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/en-US/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/en-US/highcontrastblack.css b/helpcontent2/source/auxiliary/en-US/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/en-US/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/en-US/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/en-US/highcontrastwhite.css b/helpcontent2/source/auxiliary/en-US/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/en-US/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/en-US/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/en-US/sbasic.cfg b/helpcontent2/source/auxiliary/en-US/sbasic.cfg
index f581711f9d..d37a4707a6 100755..100644
--- a/helpcontent2/source/auxiliary/en-US/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/en-US/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/en-US/scalc.cfg b/helpcontent2/source/auxiliary/en-US/scalc.cfg
index d9d7962f2d..4f77c67af7 100755..100644
--- a/helpcontent2/source/auxiliary/en-US/scalc.cfg
+++ b/helpcontent2/source/auxiliary/en-US/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/en-US/schart.cfg b/helpcontent2/source/auxiliary/en-US/schart.cfg
index c9c545c271..ad3f8ce852 100755..100644
--- a/helpcontent2/source/auxiliary/en-US/schart.cfg
+++ b/helpcontent2/source/auxiliary/en-US/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/en-US/sdatabase.cfg b/helpcontent2/source/auxiliary/en-US/sdatabase.cfg
index 859bbdce98..36f6cdff93 100644
--- a/helpcontent2/source/auxiliary/en-US/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/en-US/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/en-US/sdraw.cfg b/helpcontent2/source/auxiliary/en-US/sdraw.cfg
index 81119c21af..bc3ffea264 100755..100644
--- a/helpcontent2/source/auxiliary/en-US/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/en-US/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/en-US/simpress.cfg b/helpcontent2/source/auxiliary/en-US/simpress.cfg
index 827da159a8..f0611234ae 100755..100644
--- a/helpcontent2/source/auxiliary/en-US/simpress.cfg
+++ b/helpcontent2/source/auxiliary/en-US/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/en-US/smath.cfg b/helpcontent2/source/auxiliary/en-US/smath.cfg
index 53966b5f04..f0f8e95d90 100755..100644
--- a/helpcontent2/source/auxiliary/en-US/smath.cfg
+++ b/helpcontent2/source/auxiliary/en-US/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/en-US/swriter.cfg b/helpcontent2/source/auxiliary/en-US/swriter.cfg
index 5d3baaaad3..caeb62d3dd 100755..100644
--- a/helpcontent2/source/auxiliary/en-US/swriter.cfg
+++ b/helpcontent2/source/auxiliary/en-US/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/en-ZA/default.css b/helpcontent2/source/auxiliary/en-ZA/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/en-ZA/default.css
+++ b/helpcontent2/source/auxiliary/en-ZA/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/en-ZA/highcontrast1.css b/helpcontent2/source/auxiliary/en-ZA/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/en-ZA/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/en-ZA/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/en-ZA/highcontrast2.css b/helpcontent2/source/auxiliary/en-ZA/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/en-ZA/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/en-ZA/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/en-ZA/highcontrastblack.css b/helpcontent2/source/auxiliary/en-ZA/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/en-ZA/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/en-ZA/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/en-ZA/highcontrastwhite.css b/helpcontent2/source/auxiliary/en-ZA/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/en-ZA/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/en-ZA/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/en-ZA/sbasic.cfg b/helpcontent2/source/auxiliary/en-ZA/sbasic.cfg
index 3ddb19821f..711cbb235d 100755..100644
--- a/helpcontent2/source/auxiliary/en-ZA/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/en-ZA/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/en-ZA/scalc.cfg b/helpcontent2/source/auxiliary/en-ZA/scalc.cfg
index 3a760bb6ef..3cced0b0c4 100755..100644
--- a/helpcontent2/source/auxiliary/en-ZA/scalc.cfg
+++ b/helpcontent2/source/auxiliary/en-ZA/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/en-ZA/schart.cfg b/helpcontent2/source/auxiliary/en-ZA/schart.cfg
index b9090c0921..28099aa2cf 100755..100644
--- a/helpcontent2/source/auxiliary/en-ZA/schart.cfg
+++ b/helpcontent2/source/auxiliary/en-ZA/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/en-ZA/sdatabase.cfg b/helpcontent2/source/auxiliary/en-ZA/sdatabase.cfg
index 34aad7d363..8c6771baa2 100644
--- a/helpcontent2/source/auxiliary/en-ZA/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/en-ZA/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/en-ZA/sdraw.cfg b/helpcontent2/source/auxiliary/en-ZA/sdraw.cfg
index c0b47e97f0..e0c5b6cf7c 100755..100644
--- a/helpcontent2/source/auxiliary/en-ZA/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/en-ZA/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/en-ZA/simpress.cfg b/helpcontent2/source/auxiliary/en-ZA/simpress.cfg
index 48cf63a7fd..9a61b8f5c1 100755..100644
--- a/helpcontent2/source/auxiliary/en-ZA/simpress.cfg
+++ b/helpcontent2/source/auxiliary/en-ZA/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/en-ZA/smath.cfg b/helpcontent2/source/auxiliary/en-ZA/smath.cfg
index 807c2002bd..1c05d8afab 100755..100644
--- a/helpcontent2/source/auxiliary/en-ZA/smath.cfg
+++ b/helpcontent2/source/auxiliary/en-ZA/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/en-ZA/swriter.cfg b/helpcontent2/source/auxiliary/en-ZA/swriter.cfg
index 48099321ea..496538dd99 100755..100644
--- a/helpcontent2/source/auxiliary/en-ZA/swriter.cfg
+++ b/helpcontent2/source/auxiliary/en-ZA/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/eo/default.css b/helpcontent2/source/auxiliary/eo/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/eo/default.css
+++ b/helpcontent2/source/auxiliary/eo/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/eo/highcontrast1.css b/helpcontent2/source/auxiliary/eo/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/eo/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/eo/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/eo/highcontrast2.css b/helpcontent2/source/auxiliary/eo/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/eo/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/eo/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/eo/highcontrastblack.css b/helpcontent2/source/auxiliary/eo/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/eo/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/eo/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/eo/highcontrastwhite.css b/helpcontent2/source/auxiliary/eo/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/eo/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/eo/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/eo/sbasic.cfg b/helpcontent2/source/auxiliary/eo/sbasic.cfg
index e877361723..438bdfa064 100644
--- a/helpcontent2/source/auxiliary/eo/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/eo/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/eo/scalc.cfg b/helpcontent2/source/auxiliary/eo/scalc.cfg
index c12b08ca2d..3c81982178 100644
--- a/helpcontent2/source/auxiliary/eo/scalc.cfg
+++ b/helpcontent2/source/auxiliary/eo/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/eo/schart.cfg b/helpcontent2/source/auxiliary/eo/schart.cfg
index a0e798643b..c5e92387ec 100644
--- a/helpcontent2/source/auxiliary/eo/schart.cfg
+++ b/helpcontent2/source/auxiliary/eo/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/eo/sdatabase.cfg b/helpcontent2/source/auxiliary/eo/sdatabase.cfg
index 4e0bcc654b..e379ab615a 100644
--- a/helpcontent2/source/auxiliary/eo/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/eo/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/eo/sdraw.cfg b/helpcontent2/source/auxiliary/eo/sdraw.cfg
index 03d0caa3f2..00b7976948 100644
--- a/helpcontent2/source/auxiliary/eo/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/eo/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/eo/simpress.cfg b/helpcontent2/source/auxiliary/eo/simpress.cfg
index 9f185a05c1..5888964e2c 100644
--- a/helpcontent2/source/auxiliary/eo/simpress.cfg
+++ b/helpcontent2/source/auxiliary/eo/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/eo/smath.cfg b/helpcontent2/source/auxiliary/eo/smath.cfg
index 606ff0d5fc..416a5dabba 100644
--- a/helpcontent2/source/auxiliary/eo/smath.cfg
+++ b/helpcontent2/source/auxiliary/eo/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/eo/swriter.cfg b/helpcontent2/source/auxiliary/eo/swriter.cfg
index 24255f0005..89abc85704 100644
--- a/helpcontent2/source/auxiliary/eo/swriter.cfg
+++ b/helpcontent2/source/auxiliary/eo/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/es/default.css b/helpcontent2/source/auxiliary/es/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/es/default.css
+++ b/helpcontent2/source/auxiliary/es/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/es/highcontrast1.css b/helpcontent2/source/auxiliary/es/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/es/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/es/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/es/highcontrast2.css b/helpcontent2/source/auxiliary/es/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/es/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/es/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/es/highcontrastblack.css b/helpcontent2/source/auxiliary/es/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/es/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/es/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/es/highcontrastwhite.css b/helpcontent2/source/auxiliary/es/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/es/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/es/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/es/sbasic.cfg b/helpcontent2/source/auxiliary/es/sbasic.cfg
index 6bc820a84e..5bf0c599f3 100755..100644
--- a/helpcontent2/source/auxiliary/es/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/es/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/es/scalc.cfg b/helpcontent2/source/auxiliary/es/scalc.cfg
index edf599d0be..c591ea13c6 100755..100644
--- a/helpcontent2/source/auxiliary/es/scalc.cfg
+++ b/helpcontent2/source/auxiliary/es/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/es/schart.cfg b/helpcontent2/source/auxiliary/es/schart.cfg
index 373e0998ff..96da572fed 100755..100644
--- a/helpcontent2/source/auxiliary/es/schart.cfg
+++ b/helpcontent2/source/auxiliary/es/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/es/sdatabase.cfg b/helpcontent2/source/auxiliary/es/sdatabase.cfg
index 14a2f7a584..904ed2161a 100644
--- a/helpcontent2/source/auxiliary/es/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/es/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/es/sdraw.cfg b/helpcontent2/source/auxiliary/es/sdraw.cfg
index 304136542b..134e81d818 100755..100644
--- a/helpcontent2/source/auxiliary/es/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/es/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/es/simpress.cfg b/helpcontent2/source/auxiliary/es/simpress.cfg
index a5a28e9791..efcde6eb24 100755..100644
--- a/helpcontent2/source/auxiliary/es/simpress.cfg
+++ b/helpcontent2/source/auxiliary/es/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/es/smath.cfg b/helpcontent2/source/auxiliary/es/smath.cfg
index fe263d62c4..da8cec5882 100755..100644
--- a/helpcontent2/source/auxiliary/es/smath.cfg
+++ b/helpcontent2/source/auxiliary/es/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/es/swriter.cfg b/helpcontent2/source/auxiliary/es/swriter.cfg
index 9e11086b38..054b625f4b 100755..100644
--- a/helpcontent2/source/auxiliary/es/swriter.cfg
+++ b/helpcontent2/source/auxiliary/es/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/et/default.css b/helpcontent2/source/auxiliary/et/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/et/default.css
+++ b/helpcontent2/source/auxiliary/et/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/et/highcontrast1.css b/helpcontent2/source/auxiliary/et/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/et/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/et/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/et/highcontrast2.css b/helpcontent2/source/auxiliary/et/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/et/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/et/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/et/highcontrastblack.css b/helpcontent2/source/auxiliary/et/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/et/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/et/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/et/highcontrastwhite.css b/helpcontent2/source/auxiliary/et/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/et/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/et/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/et/sbasic.cfg b/helpcontent2/source/auxiliary/et/sbasic.cfg
index da7a239d75..9373a53d02 100644
--- a/helpcontent2/source/auxiliary/et/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/et/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/et/scalc.cfg b/helpcontent2/source/auxiliary/et/scalc.cfg
index 5537658b21..91e215b04d 100644
--- a/helpcontent2/source/auxiliary/et/scalc.cfg
+++ b/helpcontent2/source/auxiliary/et/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/et/schart.cfg b/helpcontent2/source/auxiliary/et/schart.cfg
index e3208f8755..aa27acf723 100755..100644
--- a/helpcontent2/source/auxiliary/et/schart.cfg
+++ b/helpcontent2/source/auxiliary/et/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/et/sdatabase.cfg b/helpcontent2/source/auxiliary/et/sdatabase.cfg
index 4c28047767..770c27ddf7 100644
--- a/helpcontent2/source/auxiliary/et/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/et/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/et/sdraw.cfg b/helpcontent2/source/auxiliary/et/sdraw.cfg
index 74a1b59fae..e5cba8279a 100644
--- a/helpcontent2/source/auxiliary/et/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/et/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/et/simpress.cfg b/helpcontent2/source/auxiliary/et/simpress.cfg
index c89849ea7c..ad7b27665e 100644
--- a/helpcontent2/source/auxiliary/et/simpress.cfg
+++ b/helpcontent2/source/auxiliary/et/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/et/smath.cfg b/helpcontent2/source/auxiliary/et/smath.cfg
index f194a12526..43d0992bea 100644
--- a/helpcontent2/source/auxiliary/et/smath.cfg
+++ b/helpcontent2/source/auxiliary/et/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/et/swriter.cfg b/helpcontent2/source/auxiliary/et/swriter.cfg
index 7cff315fbb..6e64f9ce60 100644
--- a/helpcontent2/source/auxiliary/et/swriter.cfg
+++ b/helpcontent2/source/auxiliary/et/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/eu/default.css b/helpcontent2/source/auxiliary/eu/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/eu/default.css
+++ b/helpcontent2/source/auxiliary/eu/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/eu/highcontrast1.css b/helpcontent2/source/auxiliary/eu/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/eu/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/eu/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/eu/highcontrast2.css b/helpcontent2/source/auxiliary/eu/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/eu/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/eu/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/eu/highcontrastblack.css b/helpcontent2/source/auxiliary/eu/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/eu/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/eu/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/eu/highcontrastwhite.css b/helpcontent2/source/auxiliary/eu/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/eu/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/eu/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/eu/sbasic.cfg b/helpcontent2/source/auxiliary/eu/sbasic.cfg
index 5986e6c9b3..c87c71a967 100644
--- a/helpcontent2/source/auxiliary/eu/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/eu/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/eu/scalc.cfg b/helpcontent2/source/auxiliary/eu/scalc.cfg
index 2758c16a4a..dada659fb7 100644
--- a/helpcontent2/source/auxiliary/eu/scalc.cfg
+++ b/helpcontent2/source/auxiliary/eu/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/eu/schart.cfg b/helpcontent2/source/auxiliary/eu/schart.cfg
index 9b1e86564f..8cde443e02 100644
--- a/helpcontent2/source/auxiliary/eu/schart.cfg
+++ b/helpcontent2/source/auxiliary/eu/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/eu/sdatabase.cfg b/helpcontent2/source/auxiliary/eu/sdatabase.cfg
index 3b9b6a74ca..2f2cc6f6e7 100644
--- a/helpcontent2/source/auxiliary/eu/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/eu/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/eu/sdraw.cfg b/helpcontent2/source/auxiliary/eu/sdraw.cfg
index 01367814c1..8e01b9e140 100644
--- a/helpcontent2/source/auxiliary/eu/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/eu/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/eu/simpress.cfg b/helpcontent2/source/auxiliary/eu/simpress.cfg
index 90f91108a5..3811c807cc 100644
--- a/helpcontent2/source/auxiliary/eu/simpress.cfg
+++ b/helpcontent2/source/auxiliary/eu/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/eu/smath.cfg b/helpcontent2/source/auxiliary/eu/smath.cfg
index 2685ec2a55..6128f32ca7 100644
--- a/helpcontent2/source/auxiliary/eu/smath.cfg
+++ b/helpcontent2/source/auxiliary/eu/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/eu/swriter.cfg b/helpcontent2/source/auxiliary/eu/swriter.cfg
index e5e837563a..eeaf51e17d 100644
--- a/helpcontent2/source/auxiliary/eu/swriter.cfg
+++ b/helpcontent2/source/auxiliary/eu/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/fa/default.css b/helpcontent2/source/auxiliary/fa/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/fa/default.css
+++ b/helpcontent2/source/auxiliary/fa/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/fa/highcontrast1.css b/helpcontent2/source/auxiliary/fa/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/fa/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/fa/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/fa/highcontrast2.css b/helpcontent2/source/auxiliary/fa/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/fa/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/fa/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/fa/highcontrastblack.css b/helpcontent2/source/auxiliary/fa/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/fa/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/fa/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/fa/highcontrastwhite.css b/helpcontent2/source/auxiliary/fa/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/fa/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/fa/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/fa/sbasic.cfg b/helpcontent2/source/auxiliary/fa/sbasic.cfg
index f581711f9d..6024cfb5f9 100755..100644
--- a/helpcontent2/source/auxiliary/fa/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/fa/sbasic.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Basic
 
-Language=en-US
+Language=fa
 Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/fa/scalc.cfg b/helpcontent2/source/auxiliary/fa/scalc.cfg
index d9d7962f2d..75c36f0083 100755..100644
--- a/helpcontent2/source/auxiliary/fa/scalc.cfg
+++ b/helpcontent2/source/auxiliary/fa/scalc.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Calc
 
-Language=en-US
+Language=fa
 Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/fa/schart.cfg b/helpcontent2/source/auxiliary/fa/schart.cfg
index 476e666d97..0418fabf96 100755..100644
--- a/helpcontent2/source/auxiliary/fa/schart.cfg
+++ b/helpcontent2/source/auxiliary/fa/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/fa/sdatabase.cfg b/helpcontent2/source/auxiliary/fa/sdatabase.cfg
index 859bbdce98..ad1ffec7ba 100644
--- a/helpcontent2/source/auxiliary/fa/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/fa/sdatabase.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Base
 
-Language=en-US
+Language=fa
 Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/fa/sdraw.cfg b/helpcontent2/source/auxiliary/fa/sdraw.cfg
index 81119c21af..9183010aa2 100755..100644
--- a/helpcontent2/source/auxiliary/fa/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/fa/sdraw.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Draw
 
-Language=en-US
+Language=fa
 Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/fa/simpress.cfg b/helpcontent2/source/auxiliary/fa/simpress.cfg
index 827da159a8..a642572268 100755..100644
--- a/helpcontent2/source/auxiliary/fa/simpress.cfg
+++ b/helpcontent2/source/auxiliary/fa/simpress.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Impress
 
-Language=en-US
+Language=fa
 Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/fa/smath.cfg b/helpcontent2/source/auxiliary/fa/smath.cfg
index 53966b5f04..5cbed61330 100755..100644
--- a/helpcontent2/source/auxiliary/fa/smath.cfg
+++ b/helpcontent2/source/auxiliary/fa/smath.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Math
 
-Language=en-US
+Language=fa
 Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/fa/swriter.cfg b/helpcontent2/source/auxiliary/fa/swriter.cfg
index 5d3baaaad3..7bef8e6907 100755..100644
--- a/helpcontent2/source/auxiliary/fa/swriter.cfg
+++ b/helpcontent2/source/auxiliary/fa/swriter.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Writer
 
-Language=en-US
+Language=fa
 Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/fi/default.css b/helpcontent2/source/auxiliary/fi/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/fi/default.css
+++ b/helpcontent2/source/auxiliary/fi/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/fi/highcontrast1.css b/helpcontent2/source/auxiliary/fi/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/fi/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/fi/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/fi/highcontrast2.css b/helpcontent2/source/auxiliary/fi/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/fi/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/fi/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/fi/highcontrastblack.css b/helpcontent2/source/auxiliary/fi/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/fi/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/fi/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/fi/highcontrastwhite.css b/helpcontent2/source/auxiliary/fi/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/fi/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/fi/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/fi/sbasic.cfg b/helpcontent2/source/auxiliary/fi/sbasic.cfg
index caf0b10a91..9c0b5515a5 100755..100644
--- a/helpcontent2/source/auxiliary/fi/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/fi/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/fi/scalc.cfg b/helpcontent2/source/auxiliary/fi/scalc.cfg
index 200761c000..9935ab2dc2 100755..100644
--- a/helpcontent2/source/auxiliary/fi/scalc.cfg
+++ b/helpcontent2/source/auxiliary/fi/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/fi/schart.cfg b/helpcontent2/source/auxiliary/fi/schart.cfg
index 274b0b14b6..bef48a9695 100755..100644
--- a/helpcontent2/source/auxiliary/fi/schart.cfg
+++ b/helpcontent2/source/auxiliary/fi/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/fi/sdatabase.cfg b/helpcontent2/source/auxiliary/fi/sdatabase.cfg
index fc30af65b8..75d9de7e07 100644
--- a/helpcontent2/source/auxiliary/fi/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/fi/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/fi/sdraw.cfg b/helpcontent2/source/auxiliary/fi/sdraw.cfg
index e36a80bfe0..38541d10e3 100755..100644
--- a/helpcontent2/source/auxiliary/fi/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/fi/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/fi/simpress.cfg b/helpcontent2/source/auxiliary/fi/simpress.cfg
index 487d991b1d..f1f97f5682 100755..100644
--- a/helpcontent2/source/auxiliary/fi/simpress.cfg
+++ b/helpcontent2/source/auxiliary/fi/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/fi/smath.cfg b/helpcontent2/source/auxiliary/fi/smath.cfg
index 21f4409039..839107c6ec 100755..100644
--- a/helpcontent2/source/auxiliary/fi/smath.cfg
+++ b/helpcontent2/source/auxiliary/fi/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/fi/swriter.cfg b/helpcontent2/source/auxiliary/fi/swriter.cfg
index 155e2ab5ca..f33b44d63a 100755..100644
--- a/helpcontent2/source/auxiliary/fi/swriter.cfg
+++ b/helpcontent2/source/auxiliary/fi/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/fr/default.css b/helpcontent2/source/auxiliary/fr/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/fr/default.css
+++ b/helpcontent2/source/auxiliary/fr/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/fr/highcontrast1.css b/helpcontent2/source/auxiliary/fr/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/fr/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/fr/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/fr/highcontrast2.css b/helpcontent2/source/auxiliary/fr/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/fr/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/fr/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/fr/highcontrastblack.css b/helpcontent2/source/auxiliary/fr/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/fr/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/fr/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/fr/highcontrastwhite.css b/helpcontent2/source/auxiliary/fr/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/fr/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/fr/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/fr/sbasic.cfg b/helpcontent2/source/auxiliary/fr/sbasic.cfg
index d686a8afd7..a633ff50cf 100755..100644
--- a/helpcontent2/source/auxiliary/fr/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/fr/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/fr/scalc.cfg b/helpcontent2/source/auxiliary/fr/scalc.cfg
index 1e6ad2820a..aeab230d78 100755..100644
--- a/helpcontent2/source/auxiliary/fr/scalc.cfg
+++ b/helpcontent2/source/auxiliary/fr/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/fr/schart.cfg b/helpcontent2/source/auxiliary/fr/schart.cfg
index 9b5eea58ed..c53d02dde4 100755..100644
--- a/helpcontent2/source/auxiliary/fr/schart.cfg
+++ b/helpcontent2/source/auxiliary/fr/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/fr/sdatabase.cfg b/helpcontent2/source/auxiliary/fr/sdatabase.cfg
index 7e93b83e3f..374ec927d1 100644
--- a/helpcontent2/source/auxiliary/fr/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/fr/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/fr/sdraw.cfg b/helpcontent2/source/auxiliary/fr/sdraw.cfg
index 9a2ab64166..298d052efe 100755..100644
--- a/helpcontent2/source/auxiliary/fr/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/fr/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/fr/simpress.cfg b/helpcontent2/source/auxiliary/fr/simpress.cfg
index a12d963a1b..14353a75ac 100755..100644
--- a/helpcontent2/source/auxiliary/fr/simpress.cfg
+++ b/helpcontent2/source/auxiliary/fr/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/fr/smath.cfg b/helpcontent2/source/auxiliary/fr/smath.cfg
index 73988ed232..7c2556ad2a 100755..100644
--- a/helpcontent2/source/auxiliary/fr/smath.cfg
+++ b/helpcontent2/source/auxiliary/fr/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/fr/swriter.cfg b/helpcontent2/source/auxiliary/fr/swriter.cfg
index b0faa6241a..2f33e2594f 100755..100644
--- a/helpcontent2/source/auxiliary/fr/swriter.cfg
+++ b/helpcontent2/source/auxiliary/fr/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ga/default.css b/helpcontent2/source/auxiliary/ga/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/ga/default.css
+++ b/helpcontent2/source/auxiliary/ga/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/ga/highcontrast1.css b/helpcontent2/source/auxiliary/ga/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/ga/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/ga/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ga/highcontrast2.css b/helpcontent2/source/auxiliary/ga/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/ga/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/ga/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ga/highcontrastblack.css b/helpcontent2/source/auxiliary/ga/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/ga/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/ga/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ga/highcontrastwhite.css b/helpcontent2/source/auxiliary/ga/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/ga/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/ga/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ga/sbasic.cfg b/helpcontent2/source/auxiliary/ga/sbasic.cfg
index 138736abd2..a7a4f66bf7 100755..100644
--- a/helpcontent2/source/auxiliary/ga/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/ga/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ga/scalc.cfg b/helpcontent2/source/auxiliary/ga/scalc.cfg
index efa2780a16..85b02697ad 100755..100644
--- a/helpcontent2/source/auxiliary/ga/scalc.cfg
+++ b/helpcontent2/source/auxiliary/ga/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ga/schart.cfg b/helpcontent2/source/auxiliary/ga/schart.cfg
index f1673bbb29..505e4c2b89 100755..100644
--- a/helpcontent2/source/auxiliary/ga/schart.cfg
+++ b/helpcontent2/source/auxiliary/ga/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/ga/sdatabase.cfg b/helpcontent2/source/auxiliary/ga/sdatabase.cfg
index 13506da8d0..f0000baa30 100644
--- a/helpcontent2/source/auxiliary/ga/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/ga/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ga/sdraw.cfg b/helpcontent2/source/auxiliary/ga/sdraw.cfg
index 44c247e37c..83cfebe7c8 100755..100644
--- a/helpcontent2/source/auxiliary/ga/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/ga/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ga/simpress.cfg b/helpcontent2/source/auxiliary/ga/simpress.cfg
index 8823b8eceb..86941a745b 100755..100644
--- a/helpcontent2/source/auxiliary/ga/simpress.cfg
+++ b/helpcontent2/source/auxiliary/ga/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ga/smath.cfg b/helpcontent2/source/auxiliary/ga/smath.cfg
index c0f526135b..12ae947f76 100755..100644
--- a/helpcontent2/source/auxiliary/ga/smath.cfg
+++ b/helpcontent2/source/auxiliary/ga/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ga/swriter.cfg b/helpcontent2/source/auxiliary/ga/swriter.cfg
index 88bc0e7642..2939bd8b48 100755..100644
--- a/helpcontent2/source/auxiliary/ga/swriter.cfg
+++ b/helpcontent2/source/auxiliary/ga/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/gl/default.css b/helpcontent2/source/auxiliary/gl/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/gl/default.css
+++ b/helpcontent2/source/auxiliary/gl/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/gl/highcontrast1.css b/helpcontent2/source/auxiliary/gl/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/gl/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/gl/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/gl/highcontrast2.css b/helpcontent2/source/auxiliary/gl/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/gl/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/gl/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/gl/highcontrastblack.css b/helpcontent2/source/auxiliary/gl/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/gl/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/gl/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/gl/highcontrastwhite.css b/helpcontent2/source/auxiliary/gl/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/gl/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/gl/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/gl/sbasic.cfg b/helpcontent2/source/auxiliary/gl/sbasic.cfg
index a641c5953f..3aa3051cde 100755..100644
--- a/helpcontent2/source/auxiliary/gl/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/gl/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/gl/scalc.cfg b/helpcontent2/source/auxiliary/gl/scalc.cfg
index 2eb057cc40..ecda7adea0 100755..100644
--- a/helpcontent2/source/auxiliary/gl/scalc.cfg
+++ b/helpcontent2/source/auxiliary/gl/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/gl/schart.cfg b/helpcontent2/source/auxiliary/gl/schart.cfg
index 9e64678760..1f364df01d 100755..100644
--- a/helpcontent2/source/auxiliary/gl/schart.cfg
+++ b/helpcontent2/source/auxiliary/gl/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/gl/sdatabase.cfg b/helpcontent2/source/auxiliary/gl/sdatabase.cfg
index c9c5c60602..bba41d92e5 100644
--- a/helpcontent2/source/auxiliary/gl/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/gl/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/gl/sdraw.cfg b/helpcontent2/source/auxiliary/gl/sdraw.cfg
index 36e8be9599..39bd1f132e 100755..100644
--- a/helpcontent2/source/auxiliary/gl/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/gl/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/gl/simpress.cfg b/helpcontent2/source/auxiliary/gl/simpress.cfg
index 4cd400d3ff..2f65c0c19f 100755..100644
--- a/helpcontent2/source/auxiliary/gl/simpress.cfg
+++ b/helpcontent2/source/auxiliary/gl/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/gl/smath.cfg b/helpcontent2/source/auxiliary/gl/smath.cfg
index 1b83099a21..ed8f7d1d1c 100755..100644
--- a/helpcontent2/source/auxiliary/gl/smath.cfg
+++ b/helpcontent2/source/auxiliary/gl/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/gl/swriter.cfg b/helpcontent2/source/auxiliary/gl/swriter.cfg
index e7b5ead660..8f18b7ea7f 100755..100644
--- a/helpcontent2/source/auxiliary/gl/swriter.cfg
+++ b/helpcontent2/source/auxiliary/gl/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/gu/default.css b/helpcontent2/source/auxiliary/gu/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/gu/default.css
+++ b/helpcontent2/source/auxiliary/gu/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/gu/highcontrast1.css b/helpcontent2/source/auxiliary/gu/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/gu/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/gu/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/gu/highcontrast2.css b/helpcontent2/source/auxiliary/gu/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/gu/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/gu/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/gu/highcontrastblack.css b/helpcontent2/source/auxiliary/gu/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/gu/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/gu/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/gu/highcontrastwhite.css b/helpcontent2/source/auxiliary/gu/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/gu/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/gu/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/gu/sbasic.cfg b/helpcontent2/source/auxiliary/gu/sbasic.cfg
index d5e97c4e3d..35989646a9 100755..100644
--- a/helpcontent2/source/auxiliary/gu/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/gu/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/gu/scalc.cfg b/helpcontent2/source/auxiliary/gu/scalc.cfg
index 5a3620ed47..807efc0411 100755..100644
--- a/helpcontent2/source/auxiliary/gu/scalc.cfg
+++ b/helpcontent2/source/auxiliary/gu/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/gu/schart.cfg b/helpcontent2/source/auxiliary/gu/schart.cfg
index 3ac63bd3bc..f94d0c39f5 100755..100644
--- a/helpcontent2/source/auxiliary/gu/schart.cfg
+++ b/helpcontent2/source/auxiliary/gu/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/gu/sdatabase.cfg b/helpcontent2/source/auxiliary/gu/sdatabase.cfg
index cd5656e348..805492ceef 100644
--- a/helpcontent2/source/auxiliary/gu/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/gu/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/gu/sdraw.cfg b/helpcontent2/source/auxiliary/gu/sdraw.cfg
index 1324cd9af3..2bb942a515 100755..100644
--- a/helpcontent2/source/auxiliary/gu/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/gu/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/gu/simpress.cfg b/helpcontent2/source/auxiliary/gu/simpress.cfg
index 0753286ff1..93a0066f4b 100755..100644
--- a/helpcontent2/source/auxiliary/gu/simpress.cfg
+++ b/helpcontent2/source/auxiliary/gu/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/gu/smath.cfg b/helpcontent2/source/auxiliary/gu/smath.cfg
index 49e136d762..dcc0832470 100755..100644
--- a/helpcontent2/source/auxiliary/gu/smath.cfg
+++ b/helpcontent2/source/auxiliary/gu/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/gu/swriter.cfg b/helpcontent2/source/auxiliary/gu/swriter.cfg
index dbf65085f0..2007311df2 100755..100644
--- a/helpcontent2/source/auxiliary/gu/swriter.cfg
+++ b/helpcontent2/source/auxiliary/gu/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/he/default.css b/helpcontent2/source/auxiliary/he/default.css
index 2fa534688a..bcdc5f4e61 100644
--- a/helpcontent2/source/auxiliary/he/default.css
+++ b/helpcontent2/source/auxiliary/he/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/he/highcontrast1.css b/helpcontent2/source/auxiliary/he/highcontrast1.css
index 354c383724..1b44518acd 100644
--- a/helpcontent2/source/auxiliary/he/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/he/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/he/highcontrast2.css b/helpcontent2/source/auxiliary/he/highcontrast2.css
index ec2763dc2b..6f934a4196 100644
--- a/helpcontent2/source/auxiliary/he/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/he/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/he/highcontrastblack.css b/helpcontent2/source/auxiliary/he/highcontrastblack.css
index e782fd491c..87c4b7e310 100644
--- a/helpcontent2/source/auxiliary/he/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/he/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/he/highcontrastwhite.css b/helpcontent2/source/auxiliary/he/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100644
--- a/helpcontent2/source/auxiliary/he/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/he/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/he/sbasic.cfg b/helpcontent2/source/auxiliary/he/sbasic.cfg
index 96718b893b..a2de480c80 100644
--- a/helpcontent2/source/auxiliary/he/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/he/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/he/scalc.cfg b/helpcontent2/source/auxiliary/he/scalc.cfg
index b1d2dbdf33..28a7d1b2b4 100644
--- a/helpcontent2/source/auxiliary/he/scalc.cfg
+++ b/helpcontent2/source/auxiliary/he/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/he/schart.cfg b/helpcontent2/source/auxiliary/he/schart.cfg
index 956b0a69b0..fad82f621d 100755..100644
--- a/helpcontent2/source/auxiliary/he/schart.cfg
+++ b/helpcontent2/source/auxiliary/he/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/he/sdatabase.cfg b/helpcontent2/source/auxiliary/he/sdatabase.cfg
index 8ed220118d..804dd8cd5e 100644
--- a/helpcontent2/source/auxiliary/he/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/he/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/he/sdraw.cfg b/helpcontent2/source/auxiliary/he/sdraw.cfg
index f474044481..0dca0c40dc 100644
--- a/helpcontent2/source/auxiliary/he/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/he/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/he/simpress.cfg b/helpcontent2/source/auxiliary/he/simpress.cfg
index 5d49f9d9e9..8ce2159d98 100644
--- a/helpcontent2/source/auxiliary/he/simpress.cfg
+++ b/helpcontent2/source/auxiliary/he/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/he/smath.cfg b/helpcontent2/source/auxiliary/he/smath.cfg
index fc9172ed2f..a442e58049 100644
--- a/helpcontent2/source/auxiliary/he/smath.cfg
+++ b/helpcontent2/source/auxiliary/he/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/he/swriter.cfg b/helpcontent2/source/auxiliary/he/swriter.cfg
index c6cf082f38..13db93fdee 100644
--- a/helpcontent2/source/auxiliary/he/swriter.cfg
+++ b/helpcontent2/source/auxiliary/he/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/hi/default.css b/helpcontent2/source/auxiliary/hi/default.css
index 11cf2bdb79..465129abc7 100755..100644
--- a/helpcontent2/source/auxiliary/hi/default.css
+++ b/helpcontent2/source/auxiliary/hi/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Lohit Hindi","Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Lohit Hindi","Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Lohit Hindi","Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Lohit Hindi","Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/hi/highcontrast1.css b/helpcontent2/source/auxiliary/hi/highcontrast1.css
index a57b430a6b..ffca4c5bbf 100755..100644
--- a/helpcontent2/source/auxiliary/hi/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/hi/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Lohit Hindi","Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Lohit Hindi","Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Lohit Hindi","Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Lohit Hindi","Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/hi/highcontrast2.css b/helpcontent2/source/auxiliary/hi/highcontrast2.css
index 4d2840c1a6..129f603e87 100755..100644
--- a/helpcontent2/source/auxiliary/hi/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/hi/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Lohit Hindi","Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Lohit Hindi","Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Lohit Hindi","Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Lohit Hindi","Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/hi/highcontrastblack.css b/helpcontent2/source/auxiliary/hi/highcontrastblack.css
index cda90d84ed..7602bb6086 100755..100644
--- a/helpcontent2/source/auxiliary/hi/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/hi/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Lohit Hindi","Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Lohit Hindi","Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Lohit Hindi","Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Lohit Hindi","Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/hi/highcontrastwhite.css b/helpcontent2/source/auxiliary/hi/highcontrastwhite.css
index 105e2f8a6c..b55a38efcf 100755..100644
--- a/helpcontent2/source/auxiliary/hi/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/hi/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Lohit Hindi","Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Lohit Hindi","Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Lohit Hindi","Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Lohit Hindi","Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/hi/sbasic.cfg b/helpcontent2/source/auxiliary/hi/sbasic.cfg
index cdd2b6a8eb..759236eae7 100755..100644
--- a/helpcontent2/source/auxiliary/hi/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/hi/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/hi/scalc.cfg b/helpcontent2/source/auxiliary/hi/scalc.cfg
index 3590b9ad35..4335262306 100755..100644
--- a/helpcontent2/source/auxiliary/hi/scalc.cfg
+++ b/helpcontent2/source/auxiliary/hi/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/hi/schart.cfg b/helpcontent2/source/auxiliary/hi/schart.cfg
index 908a729c7c..8fd885384b 100755..100644
--- a/helpcontent2/source/auxiliary/hi/schart.cfg
+++ b/helpcontent2/source/auxiliary/hi/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/hi/sdatabase.cfg b/helpcontent2/source/auxiliary/hi/sdatabase.cfg
index a76f77894b..bab12d89c3 100644
--- a/helpcontent2/source/auxiliary/hi/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/hi/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/hi/sdraw.cfg b/helpcontent2/source/auxiliary/hi/sdraw.cfg
index 1fcd2faa61..00d69e30cc 100755..100644
--- a/helpcontent2/source/auxiliary/hi/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/hi/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/hi/simpress.cfg b/helpcontent2/source/auxiliary/hi/simpress.cfg
index 08dd3c26c9..096c534f61 100755..100644
--- a/helpcontent2/source/auxiliary/hi/simpress.cfg
+++ b/helpcontent2/source/auxiliary/hi/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/hi/smath.cfg b/helpcontent2/source/auxiliary/hi/smath.cfg
index a54638175a..b275f60170 100755..100644
--- a/helpcontent2/source/auxiliary/hi/smath.cfg
+++ b/helpcontent2/source/auxiliary/hi/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/hi/swriter.cfg b/helpcontent2/source/auxiliary/hi/swriter.cfg
index 246c8a6aaa..98d0337b55 100755..100644
--- a/helpcontent2/source/auxiliary/hi/swriter.cfg
+++ b/helpcontent2/source/auxiliary/hi/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/hr/default.css b/helpcontent2/source/auxiliary/hr/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/hr/default.css
+++ b/helpcontent2/source/auxiliary/hr/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/hr/highcontrast1.css b/helpcontent2/source/auxiliary/hr/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/hr/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/hr/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/hr/highcontrast2.css b/helpcontent2/source/auxiliary/hr/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/hr/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/hr/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/hr/highcontrastblack.css b/helpcontent2/source/auxiliary/hr/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/hr/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/hr/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/hr/highcontrastwhite.css b/helpcontent2/source/auxiliary/hr/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/hr/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/hr/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/hr/sbasic.cfg b/helpcontent2/source/auxiliary/hr/sbasic.cfg
index 6be2a1d34d..6823473294 100755..100644
--- a/helpcontent2/source/auxiliary/hr/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/hr/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/hr/scalc.cfg b/helpcontent2/source/auxiliary/hr/scalc.cfg
index 78c9b49e81..6c0b99f797 100755..100644
--- a/helpcontent2/source/auxiliary/hr/scalc.cfg
+++ b/helpcontent2/source/auxiliary/hr/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/hr/schart.cfg b/helpcontent2/source/auxiliary/hr/schart.cfg
index 1f67cbe073..0ee04b21f7 100755..100644
--- a/helpcontent2/source/auxiliary/hr/schart.cfg
+++ b/helpcontent2/source/auxiliary/hr/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/hr/sdatabase.cfg b/helpcontent2/source/auxiliary/hr/sdatabase.cfg
index 0a9f4114db..9956ac25fb 100644
--- a/helpcontent2/source/auxiliary/hr/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/hr/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/hr/sdraw.cfg b/helpcontent2/source/auxiliary/hr/sdraw.cfg
index 971e62fe0d..6a597c2634 100755..100644
--- a/helpcontent2/source/auxiliary/hr/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/hr/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/hr/simpress.cfg b/helpcontent2/source/auxiliary/hr/simpress.cfg
index aae3be883c..95eff12d24 100755..100644
--- a/helpcontent2/source/auxiliary/hr/simpress.cfg
+++ b/helpcontent2/source/auxiliary/hr/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/hr/smath.cfg b/helpcontent2/source/auxiliary/hr/smath.cfg
index 26b219f6fb..6a0d298b1f 100755..100644
--- a/helpcontent2/source/auxiliary/hr/smath.cfg
+++ b/helpcontent2/source/auxiliary/hr/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/hr/swriter.cfg b/helpcontent2/source/auxiliary/hr/swriter.cfg
index 18e425c73f..eb94988d3d 100755..100644
--- a/helpcontent2/source/auxiliary/hr/swriter.cfg
+++ b/helpcontent2/source/auxiliary/hr/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/hu/default.css b/helpcontent2/source/auxiliary/hu/default.css
index 39c0e7c100..28ca685c53 100644
--- a/helpcontent2/source/auxiliary/hu/default.css
+++ b/helpcontent2/source/auxiliary/hu/default.css
@@ -29,10 +29,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
+	{ font-family: "Albany AMT",Albany,Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Cumberland,Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/hu/highcontrast1.css b/helpcontent2/source/auxiliary/hu/highcontrast1.css
index 7ab33fbbbb..750889d59a 100644
--- a/helpcontent2/source/auxiliary/hu/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/hu/highcontrast1.css
@@ -29,10 +29,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
+	{ font-family: "Albany AMT",Albany,Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Cumberland,Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/hu/highcontrast2.css b/helpcontent2/source/auxiliary/hu/highcontrast2.css
index 930dfe9605..a539032262 100644
--- a/helpcontent2/source/auxiliary/hu/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/hu/highcontrast2.css
@@ -30,10 +30,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
+	{ font-family: "Albany AMT",Albany,Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Cumberland,Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/hu/highcontrastblack.css b/helpcontent2/source/auxiliary/hu/highcontrastblack.css
index 63732b88ff..4a8537e5f2 100644
--- a/helpcontent2/source/auxiliary/hu/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/hu/highcontrastblack.css
@@ -30,10 +30,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
+	{ font-family: "Albany AMT",Albany,Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Cumberland,Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/hu/highcontrastwhite.css b/helpcontent2/source/auxiliary/hu/highcontrastwhite.css
index e3743341a0..58d6f9eebd 100644
--- a/helpcontent2/source/auxiliary/hu/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/hu/highcontrastwhite.css
@@ -30,10 +30,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
+	{ font-family: "Albany AMT",Albany,Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Cumberland,Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/hu/sbasic.cfg b/helpcontent2/source/auxiliary/hu/sbasic.cfg
index 02947fa578..4192544ad2 100644
--- a/helpcontent2/source/auxiliary/hu/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/hu/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/hu/scalc.cfg b/helpcontent2/source/auxiliary/hu/scalc.cfg
index 03132efd15..c5a45c1461 100644
--- a/helpcontent2/source/auxiliary/hu/scalc.cfg
+++ b/helpcontent2/source/auxiliary/hu/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/hu/schart.cfg b/helpcontent2/source/auxiliary/hu/schart.cfg
index 93a7c3dd98..850014bf3c 100755..100644
--- a/helpcontent2/source/auxiliary/hu/schart.cfg
+++ b/helpcontent2/source/auxiliary/hu/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/hu/sdatabase.cfg b/helpcontent2/source/auxiliary/hu/sdatabase.cfg
index 42100e00c2..c8e67eccdf 100644
--- a/helpcontent2/source/auxiliary/hu/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/hu/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/hu/sdraw.cfg b/helpcontent2/source/auxiliary/hu/sdraw.cfg
index 8ef74dc4c3..607a24d361 100644
--- a/helpcontent2/source/auxiliary/hu/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/hu/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/hu/simpress.cfg b/helpcontent2/source/auxiliary/hu/simpress.cfg
index 82e1b4559d..d9f273a947 100644
--- a/helpcontent2/source/auxiliary/hu/simpress.cfg
+++ b/helpcontent2/source/auxiliary/hu/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/hu/smath.cfg b/helpcontent2/source/auxiliary/hu/smath.cfg
index 8777acc7e2..5b4d713f97 100644
--- a/helpcontent2/source/auxiliary/hu/smath.cfg
+++ b/helpcontent2/source/auxiliary/hu/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/hu/swriter.cfg b/helpcontent2/source/auxiliary/hu/swriter.cfg
index 9dce692c8e..83fcf2b85c 100644
--- a/helpcontent2/source/auxiliary/hu/swriter.cfg
+++ b/helpcontent2/source/auxiliary/hu/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/id/default.css b/helpcontent2/source/auxiliary/id/default.css
new file mode 100644
index 0000000000..bcdc5f4e61
--- /dev/null
+++ b/helpcontent2/source/auxiliary/id/default.css
@@ -0,0 +1,73 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                          DEFAULT STYLESHEET                       +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold; }
+
+.related
+	{ font-weight: bold; margin-top:20pt; border-top: 1px solid black;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; border: 1px solid #999999; background: #FFFFFF; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; margin-top: 2px; margin-bottom: 2px;}
+
+h1
+	{ font-size: 18pt; border-bottom: 1px solid black; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.howtoget
+	{ background:#EEEEEE;}
+
+.howtogetbody
+	{ background:#EEEEEE; margin: 0px;}
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+.debug
+	{ border: 1px solid black; padding: 3px; display: none;}
diff --git a/helpcontent2/source/auxiliary/id/highcontrast1.css b/helpcontent2/source/auxiliary/id/highcontrast1.css
new file mode 100644
index 0000000000..1b44518acd
--- /dev/null
+++ b/helpcontent2/source/auxiliary/id/highcontrast1.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #1 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFF00;}
+
+.related 
+	{ border-top: 1px solid #FFFF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/id/highcontrast2.css b/helpcontent2/source/auxiliary/id/highcontrast2.css
new file mode 100644
index 0000000000..6f934a4196
--- /dev/null
+++ b/helpcontent2/source/auxiliary/id/highcontrast2.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #2 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #00FF00;}
+
+.related 
+	{ border-top: 1px solid #00FF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #00FF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #00FF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/id/highcontrastblack.css b/helpcontent2/source/auxiliary/id/highcontrastblack.css
new file mode 100644
index 0000000000..87c4b7e310
--- /dev/null
+++ b/helpcontent2/source/auxiliary/id/highcontrastblack.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST BLACK STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFFFF;}
+
+.related 
+	{ border-top: 1px solid #FFFFFF; }
+
+.howtogetheader
+	{border: 1px solid #FFFFFF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFFFF; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFFFF; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/id/highcontrastwhite.css b/helpcontent2/source/auxiliary/id/highcontrastwhite.css
new file mode 100644
index 0000000000..9c8bbe469e
--- /dev/null
+++ b/helpcontent2/source/auxiliary/id/highcontrastwhite.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST WHITE STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #FFFFFF; color: #000000;}
+
+.related 
+	{ border-top: 1px solid #000000; }
+
+.howtogetheader
+	{border: 1px solid #000000; background: #FFFFFF;}
+
+h1 
+	{ border-bottom: 1px solid #000000; ]
+
+.howtoget
+	{ background:#FFFFFF;}
+
+.howtogetbody
+	{ background:#FFFFFF;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #000000; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/id/sbasic.cfg b/helpcontent2/source/auxiliary/id/sbasic.cfg
new file mode 100644
index 0000000000..0098c035e4
--- /dev/null
+++ b/helpcontent2/source/auxiliary/id/sbasic.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Basic
+
+Language=id
+Order=7
+Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
+Heading=headingheading
+Program=BASIC 
diff --git a/helpcontent2/source/auxiliary/id/scalc.cfg b/helpcontent2/source/auxiliary/id/scalc.cfg
new file mode 100644
index 0000000000..2c174642e6
--- /dev/null
+++ b/helpcontent2/source/auxiliary/id/scalc.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Calc
+
+Language=id
+Order=3
+Start=text%2Fscalc%2Fmain0000.xhp
+Heading=headingheading
+Program=CALC
diff --git a/helpcontent2/source/auxiliary/id/schart.cfg b/helpcontent2/source/auxiliary/id/schart.cfg
new file mode 100644
index 0000000000..f73e9006fb
--- /dev/null
+++ b/helpcontent2/source/auxiliary/id/schart.cfg
@@ -0,0 +1,8 @@
+Title=%PRODUCTNAME Chart
+
+Language=id
+Order=4
+Start=text%2Fschart%2Fmain0000.xhp
+Heading=headingheading
+Program=CHART
+
diff --git a/helpcontent2/source/auxiliary/id/sdatabase.cfg b/helpcontent2/source/auxiliary/id/sdatabase.cfg
new file mode 100644
index 0000000000..a669d512bb
--- /dev/null
+++ b/helpcontent2/source/auxiliary/id/sdatabase.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Base
+
+Language=id
+Order=7
+Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
+Heading=headingheading
+Program=DATABASE 
diff --git a/helpcontent2/source/auxiliary/id/sdraw.cfg b/helpcontent2/source/auxiliary/id/sdraw.cfg
new file mode 100644
index 0000000000..f664c27983
--- /dev/null
+++ b/helpcontent2/source/auxiliary/id/sdraw.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Draw
+
+Language=id
+Order=4
+Start=text%2Fsdraw%2Fmain0000.xhp
+Heading=headingheading
+Program=DRAW
diff --git a/helpcontent2/source/auxiliary/id/simpress.cfg b/helpcontent2/source/auxiliary/id/simpress.cfg
new file mode 100644
index 0000000000..2bd7a63c9f
--- /dev/null
+++ b/helpcontent2/source/auxiliary/id/simpress.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Impress
+
+Language=id
+Order=5
+Start=text%2Fsimpress%2Fmain0000.xhp
+Heading=headingheading
+Program=IMPRESS
diff --git a/helpcontent2/source/auxiliary/id/smath.cfg b/helpcontent2/source/auxiliary/id/smath.cfg
new file mode 100644
index 0000000000..519b799bb8
--- /dev/null
+++ b/helpcontent2/source/auxiliary/id/smath.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Math
+
+Language=id
+Order=6
+Start=text%2Fsmath%2Fmain0000.xhp
+Heading=headingheading
+Program=MATH
diff --git a/helpcontent2/source/auxiliary/id/swriter.cfg b/helpcontent2/source/auxiliary/id/swriter.cfg
new file mode 100644
index 0000000000..b4052eeda8
--- /dev/null
+++ b/helpcontent2/source/auxiliary/id/swriter.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Writer
+
+Language=id
+Order=2
+Start=text%2Fswriter%2Fmain0000.xhp
+Heading=headingheading
+Program=WRITER
diff --git a/helpcontent2/source/auxiliary/is/default.css b/helpcontent2/source/auxiliary/is/default.css
new file mode 100644
index 0000000000..bcdc5f4e61
--- /dev/null
+++ b/helpcontent2/source/auxiliary/is/default.css
@@ -0,0 +1,73 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                          DEFAULT STYLESHEET                       +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold; }
+
+.related
+	{ font-weight: bold; margin-top:20pt; border-top: 1px solid black;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; border: 1px solid #999999; background: #FFFFFF; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; margin-top: 2px; margin-bottom: 2px;}
+
+h1
+	{ font-size: 18pt; border-bottom: 1px solid black; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.howtoget
+	{ background:#EEEEEE;}
+
+.howtogetbody
+	{ background:#EEEEEE; margin: 0px;}
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+.debug
+	{ border: 1px solid black; padding: 3px; display: none;}
diff --git a/helpcontent2/source/auxiliary/is/highcontrast1.css b/helpcontent2/source/auxiliary/is/highcontrast1.css
new file mode 100644
index 0000000000..1b44518acd
--- /dev/null
+++ b/helpcontent2/source/auxiliary/is/highcontrast1.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #1 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFF00;}
+
+.related 
+	{ border-top: 1px solid #FFFF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/is/highcontrast2.css b/helpcontent2/source/auxiliary/is/highcontrast2.css
new file mode 100644
index 0000000000..6f934a4196
--- /dev/null
+++ b/helpcontent2/source/auxiliary/is/highcontrast2.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #2 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #00FF00;}
+
+.related 
+	{ border-top: 1px solid #00FF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #00FF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #00FF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/is/highcontrastblack.css b/helpcontent2/source/auxiliary/is/highcontrastblack.css
new file mode 100644
index 0000000000..87c4b7e310
--- /dev/null
+++ b/helpcontent2/source/auxiliary/is/highcontrastblack.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST BLACK STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFFFF;}
+
+.related 
+	{ border-top: 1px solid #FFFFFF; }
+
+.howtogetheader
+	{border: 1px solid #FFFFFF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFFFF; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFFFF; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/is/highcontrastwhite.css b/helpcontent2/source/auxiliary/is/highcontrastwhite.css
new file mode 100644
index 0000000000..9c8bbe469e
--- /dev/null
+++ b/helpcontent2/source/auxiliary/is/highcontrastwhite.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST WHITE STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #FFFFFF; color: #000000;}
+
+.related 
+	{ border-top: 1px solid #000000; }
+
+.howtogetheader
+	{border: 1px solid #000000; background: #FFFFFF;}
+
+h1 
+	{ border-bottom: 1px solid #000000; ]
+
+.howtoget
+	{ background:#FFFFFF;}
+
+.howtogetbody
+	{ background:#FFFFFF;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #000000; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/is/sbasic.cfg b/helpcontent2/source/auxiliary/is/sbasic.cfg
new file mode 100644
index 0000000000..a9d3e993cc
--- /dev/null
+++ b/helpcontent2/source/auxiliary/is/sbasic.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Basic
+
+Language=is
+Order=7
+Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
+Heading=headingheading
+Program=BASIC 
diff --git a/helpcontent2/source/auxiliary/is/scalc.cfg b/helpcontent2/source/auxiliary/is/scalc.cfg
new file mode 100644
index 0000000000..6d191bb368
--- /dev/null
+++ b/helpcontent2/source/auxiliary/is/scalc.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Calc
+
+Language=is
+Order=3
+Start=text%2Fscalc%2Fmain0000.xhp
+Heading=headingheading
+Program=CALC
diff --git a/helpcontent2/source/auxiliary/is/schart.cfg b/helpcontent2/source/auxiliary/is/schart.cfg
new file mode 100644
index 0000000000..06b7a47c0e
--- /dev/null
+++ b/helpcontent2/source/auxiliary/is/schart.cfg
@@ -0,0 +1,8 @@
+Title=%PRODUCTNAME Chart
+
+Language=is
+Order=4
+Start=text%2Fschart%2Fmain0000.xhp
+Heading=headingheading
+Program=CHART
+
diff --git a/helpcontent2/source/auxiliary/is/sdatabase.cfg b/helpcontent2/source/auxiliary/is/sdatabase.cfg
new file mode 100644
index 0000000000..7c07e2cc1a
--- /dev/null
+++ b/helpcontent2/source/auxiliary/is/sdatabase.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Base
+
+Language=is
+Order=7
+Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
+Heading=headingheading
+Program=DATABASE 
diff --git a/helpcontent2/source/auxiliary/is/sdraw.cfg b/helpcontent2/source/auxiliary/is/sdraw.cfg
new file mode 100644
index 0000000000..afb738697a
--- /dev/null
+++ b/helpcontent2/source/auxiliary/is/sdraw.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Draw
+
+Language=is
+Order=4
+Start=text%2Fsdraw%2Fmain0000.xhp
+Heading=headingheading
+Program=DRAW
diff --git a/helpcontent2/source/auxiliary/is/simpress.cfg b/helpcontent2/source/auxiliary/is/simpress.cfg
new file mode 100644
index 0000000000..7a266de3bc
--- /dev/null
+++ b/helpcontent2/source/auxiliary/is/simpress.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Impress
+
+Language=is
+Order=5
+Start=text%2Fsimpress%2Fmain0000.xhp
+Heading=headingheading
+Program=IMPRESS
diff --git a/helpcontent2/source/auxiliary/is/smath.cfg b/helpcontent2/source/auxiliary/is/smath.cfg
new file mode 100644
index 0000000000..eff5dc8f52
--- /dev/null
+++ b/helpcontent2/source/auxiliary/is/smath.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Math
+
+Language=is
+Order=6
+Start=text%2Fsmath%2Fmain0000.xhp
+Heading=headingheading
+Program=MATH
diff --git a/helpcontent2/source/auxiliary/is/swriter.cfg b/helpcontent2/source/auxiliary/is/swriter.cfg
new file mode 100644
index 0000000000..09291e4d07
--- /dev/null
+++ b/helpcontent2/source/auxiliary/is/swriter.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Writer
+
+Language=is
+Order=2
+Start=text%2Fswriter%2Fmain0000.xhp
+Heading=headingheading
+Program=WRITER
diff --git a/helpcontent2/source/auxiliary/it/default.css b/helpcontent2/source/auxiliary/it/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/it/default.css
+++ b/helpcontent2/source/auxiliary/it/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/it/highcontrast1.css b/helpcontent2/source/auxiliary/it/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/it/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/it/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/it/highcontrast2.css b/helpcontent2/source/auxiliary/it/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/it/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/it/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/it/highcontrastblack.css b/helpcontent2/source/auxiliary/it/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/it/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/it/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/it/highcontrastwhite.css b/helpcontent2/source/auxiliary/it/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/it/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/it/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/it/sbasic.cfg b/helpcontent2/source/auxiliary/it/sbasic.cfg
index cd39bf75d2..1d2ea6138c 100755..100644
--- a/helpcontent2/source/auxiliary/it/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/it/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/it/scalc.cfg b/helpcontent2/source/auxiliary/it/scalc.cfg
index a193fef56b..49f59eda8f 100755..100644
--- a/helpcontent2/source/auxiliary/it/scalc.cfg
+++ b/helpcontent2/source/auxiliary/it/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/it/schart.cfg b/helpcontent2/source/auxiliary/it/schart.cfg
index 2b3cf9b375..8e96ba4020 100755..100644
--- a/helpcontent2/source/auxiliary/it/schart.cfg
+++ b/helpcontent2/source/auxiliary/it/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/it/sdatabase.cfg b/helpcontent2/source/auxiliary/it/sdatabase.cfg
index 6a9e95cd32..fb5e8e1dfd 100644
--- a/helpcontent2/source/auxiliary/it/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/it/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/it/sdraw.cfg b/helpcontent2/source/auxiliary/it/sdraw.cfg
index 2041750704..46ac743371 100755..100644
--- a/helpcontent2/source/auxiliary/it/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/it/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/it/simpress.cfg b/helpcontent2/source/auxiliary/it/simpress.cfg
index 5225221385..52909b04d7 100755..100644
--- a/helpcontent2/source/auxiliary/it/simpress.cfg
+++ b/helpcontent2/source/auxiliary/it/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/it/smath.cfg b/helpcontent2/source/auxiliary/it/smath.cfg
index cc719af394..1ee6f9e3e4 100755..100644
--- a/helpcontent2/source/auxiliary/it/smath.cfg
+++ b/helpcontent2/source/auxiliary/it/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/it/swriter.cfg b/helpcontent2/source/auxiliary/it/swriter.cfg
index 25db36583c..7eca84b776 100755..100644
--- a/helpcontent2/source/auxiliary/it/swriter.cfg
+++ b/helpcontent2/source/auxiliary/it/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ja/default.css b/helpcontent2/source/auxiliary/ja/default.css
index 544b3aa449..544b3aa449 100755..100644
--- a/helpcontent2/source/auxiliary/ja/default.css
+++ b/helpcontent2/source/auxiliary/ja/default.css
diff --git a/helpcontent2/source/auxiliary/ja/highcontrast1.css b/helpcontent2/source/auxiliary/ja/highcontrast1.css
index fa92ca236c..fa92ca236c 100755..100644
--- a/helpcontent2/source/auxiliary/ja/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/ja/highcontrast1.css
diff --git a/helpcontent2/source/auxiliary/ja/highcontrast2.css b/helpcontent2/source/auxiliary/ja/highcontrast2.css
index 95de592b21..95de592b21 100755..100644
--- a/helpcontent2/source/auxiliary/ja/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/ja/highcontrast2.css
diff --git a/helpcontent2/source/auxiliary/ja/highcontrastblack.css b/helpcontent2/source/auxiliary/ja/highcontrastblack.css
index c516d3ee24..c516d3ee24 100755..100644
--- a/helpcontent2/source/auxiliary/ja/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/ja/highcontrastblack.css
diff --git a/helpcontent2/source/auxiliary/ja/highcontrastwhite.css b/helpcontent2/source/auxiliary/ja/highcontrastwhite.css
index af14dd10a7..af14dd10a7 100755..100644
--- a/helpcontent2/source/auxiliary/ja/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/ja/highcontrastwhite.css
diff --git a/helpcontent2/source/auxiliary/ja/sbasic.cfg b/helpcontent2/source/auxiliary/ja/sbasic.cfg
index 37c1b8dc9c..efea02dd48 100755..100644
--- a/helpcontent2/source/auxiliary/ja/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/ja/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ja/scalc.cfg b/helpcontent2/source/auxiliary/ja/scalc.cfg
index 40d3602a9f..271d03a887 100755..100644
--- a/helpcontent2/source/auxiliary/ja/scalc.cfg
+++ b/helpcontent2/source/auxiliary/ja/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ja/schart.cfg b/helpcontent2/source/auxiliary/ja/schart.cfg
index 564a48570e..7d81c5adae 100755..100644
--- a/helpcontent2/source/auxiliary/ja/schart.cfg
+++ b/helpcontent2/source/auxiliary/ja/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/ja/sdatabase.cfg b/helpcontent2/source/auxiliary/ja/sdatabase.cfg
index 3eff0e8093..94764aad59 100644
--- a/helpcontent2/source/auxiliary/ja/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/ja/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ja/sdraw.cfg b/helpcontent2/source/auxiliary/ja/sdraw.cfg
index fbbad39762..cad5f68666 100755..100644
--- a/helpcontent2/source/auxiliary/ja/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/ja/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ja/simpress.cfg b/helpcontent2/source/auxiliary/ja/simpress.cfg
index 93be422006..cb42d79504 100755..100644
--- a/helpcontent2/source/auxiliary/ja/simpress.cfg
+++ b/helpcontent2/source/auxiliary/ja/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ja/smath.cfg b/helpcontent2/source/auxiliary/ja/smath.cfg
index 4acc37ca51..d810b7fc4d 100755..100644
--- a/helpcontent2/source/auxiliary/ja/smath.cfg
+++ b/helpcontent2/source/auxiliary/ja/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ja/swriter.cfg b/helpcontent2/source/auxiliary/ja/swriter.cfg
index e8a20e225d..87dd0ef163 100755..100644
--- a/helpcontent2/source/auxiliary/ja/swriter.cfg
+++ b/helpcontent2/source/auxiliary/ja/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ka/default.css b/helpcontent2/source/auxiliary/ka/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/ka/default.css
+++ b/helpcontent2/source/auxiliary/ka/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/ka/highcontrast1.css b/helpcontent2/source/auxiliary/ka/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/ka/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/ka/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ka/highcontrast2.css b/helpcontent2/source/auxiliary/ka/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/ka/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/ka/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ka/highcontrastblack.css b/helpcontent2/source/auxiliary/ka/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/ka/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/ka/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ka/highcontrastwhite.css b/helpcontent2/source/auxiliary/ka/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/ka/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/ka/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ka/sbasic.cfg b/helpcontent2/source/auxiliary/ka/sbasic.cfg
index cd15b8984a..bdcff64430 100755..100644
--- a/helpcontent2/source/auxiliary/ka/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/ka/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ka/scalc.cfg b/helpcontent2/source/auxiliary/ka/scalc.cfg
index 31fd207bce..3c85434301 100755..100644
--- a/helpcontent2/source/auxiliary/ka/scalc.cfg
+++ b/helpcontent2/source/auxiliary/ka/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ka/schart.cfg b/helpcontent2/source/auxiliary/ka/schart.cfg
index 90596afacd..edd5961fc3 100755..100644
--- a/helpcontent2/source/auxiliary/ka/schart.cfg
+++ b/helpcontent2/source/auxiliary/ka/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/ka/sdatabase.cfg b/helpcontent2/source/auxiliary/ka/sdatabase.cfg
index 4b483424f3..88dc4875db 100644
--- a/helpcontent2/source/auxiliary/ka/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/ka/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ka/sdraw.cfg b/helpcontent2/source/auxiliary/ka/sdraw.cfg
index 9c90db734e..0d6c2f6682 100755..100644
--- a/helpcontent2/source/auxiliary/ka/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/ka/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ka/simpress.cfg b/helpcontent2/source/auxiliary/ka/simpress.cfg
index 0316da3617..89a46c5ee4 100755..100644
--- a/helpcontent2/source/auxiliary/ka/simpress.cfg
+++ b/helpcontent2/source/auxiliary/ka/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ka/smath.cfg b/helpcontent2/source/auxiliary/ka/smath.cfg
index e06f992756..4170990e8f 100755..100644
--- a/helpcontent2/source/auxiliary/ka/smath.cfg
+++ b/helpcontent2/source/auxiliary/ka/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ka/swriter.cfg b/helpcontent2/source/auxiliary/ka/swriter.cfg
index fc5a3a2480..512d2a7439 100755..100644
--- a/helpcontent2/source/auxiliary/ka/swriter.cfg
+++ b/helpcontent2/source/auxiliary/ka/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/kid/default.css b/helpcontent2/source/auxiliary/kid/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/kid/default.css
+++ b/helpcontent2/source/auxiliary/kid/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/kid/highcontrast1.css b/helpcontent2/source/auxiliary/kid/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/kid/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/kid/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/kid/highcontrast2.css b/helpcontent2/source/auxiliary/kid/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/kid/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/kid/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/kid/highcontrastblack.css b/helpcontent2/source/auxiliary/kid/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/kid/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/kid/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/kid/highcontrastwhite.css b/helpcontent2/source/auxiliary/kid/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/kid/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/kid/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/kid/sbasic.cfg b/helpcontent2/source/auxiliary/kid/sbasic.cfg
index b41dd27bd2..040b92f810 100644
--- a/helpcontent2/source/auxiliary/kid/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/kid/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/kid/scalc.cfg b/helpcontent2/source/auxiliary/kid/scalc.cfg
index b163166aef..913fab90bc 100644
--- a/helpcontent2/source/auxiliary/kid/scalc.cfg
+++ b/helpcontent2/source/auxiliary/kid/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/kid/schart.cfg b/helpcontent2/source/auxiliary/kid/schart.cfg
index 32e600d6ce..45ccae658b 100644
--- a/helpcontent2/source/auxiliary/kid/schart.cfg
+++ b/helpcontent2/source/auxiliary/kid/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/kid/sdatabase.cfg b/helpcontent2/source/auxiliary/kid/sdatabase.cfg
index 2f7b2e917d..ab0d08dcd0 100644
--- a/helpcontent2/source/auxiliary/kid/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/kid/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/kid/sdraw.cfg b/helpcontent2/source/auxiliary/kid/sdraw.cfg
index 85b020d11a..b67d708f18 100644
--- a/helpcontent2/source/auxiliary/kid/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/kid/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/kid/simpress.cfg b/helpcontent2/source/auxiliary/kid/simpress.cfg
index 6905965bf2..6eca3e1546 100644
--- a/helpcontent2/source/auxiliary/kid/simpress.cfg
+++ b/helpcontent2/source/auxiliary/kid/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/kid/smath.cfg b/helpcontent2/source/auxiliary/kid/smath.cfg
index 3d8a632551..2d7f94dca8 100644
--- a/helpcontent2/source/auxiliary/kid/smath.cfg
+++ b/helpcontent2/source/auxiliary/kid/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/kid/swriter.cfg b/helpcontent2/source/auxiliary/kid/swriter.cfg
index f09b320b69..17016681ce 100644
--- a/helpcontent2/source/auxiliary/kid/swriter.cfg
+++ b/helpcontent2/source/auxiliary/kid/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/kk/default.css b/helpcontent2/source/auxiliary/kk/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/kk/default.css
+++ b/helpcontent2/source/auxiliary/kk/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/kk/highcontrast1.css b/helpcontent2/source/auxiliary/kk/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/kk/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/kk/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/kk/highcontrast2.css b/helpcontent2/source/auxiliary/kk/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/kk/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/kk/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/kk/highcontrastblack.css b/helpcontent2/source/auxiliary/kk/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/kk/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/kk/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/kk/highcontrastwhite.css b/helpcontent2/source/auxiliary/kk/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/kk/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/kk/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/kk/sbasic.cfg b/helpcontent2/source/auxiliary/kk/sbasic.cfg
index 0b8f658e08..4dba2da537 100644
--- a/helpcontent2/source/auxiliary/kk/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/kk/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/kk/scalc.cfg b/helpcontent2/source/auxiliary/kk/scalc.cfg
index bd1861ce5b..925c7da77f 100644
--- a/helpcontent2/source/auxiliary/kk/scalc.cfg
+++ b/helpcontent2/source/auxiliary/kk/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/kk/schart.cfg b/helpcontent2/source/auxiliary/kk/schart.cfg
index a41c1767c5..a914d62476 100644
--- a/helpcontent2/source/auxiliary/kk/schart.cfg
+++ b/helpcontent2/source/auxiliary/kk/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/kk/sdatabase.cfg b/helpcontent2/source/auxiliary/kk/sdatabase.cfg
index a7bd979c68..d5cca729cf 100644
--- a/helpcontent2/source/auxiliary/kk/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/kk/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/kk/sdraw.cfg b/helpcontent2/source/auxiliary/kk/sdraw.cfg
index 2d17351f9d..a74859d793 100644
--- a/helpcontent2/source/auxiliary/kk/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/kk/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/kk/simpress.cfg b/helpcontent2/source/auxiliary/kk/simpress.cfg
index 42066cba82..1cceb6c109 100644
--- a/helpcontent2/source/auxiliary/kk/simpress.cfg
+++ b/helpcontent2/source/auxiliary/kk/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/kk/smath.cfg b/helpcontent2/source/auxiliary/kk/smath.cfg
index 72cf9f698e..b813b87dba 100644
--- a/helpcontent2/source/auxiliary/kk/smath.cfg
+++ b/helpcontent2/source/auxiliary/kk/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/kk/swriter.cfg b/helpcontent2/source/auxiliary/kk/swriter.cfg
index 4aa41b241a..356ac97564 100644
--- a/helpcontent2/source/auxiliary/kk/swriter.cfg
+++ b/helpcontent2/source/auxiliary/kk/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/km/default.css b/helpcontent2/source/auxiliary/km/default.css
index 0187628963..624eb19cfa 100644
--- a/helpcontent2/source/auxiliary/km/default.css
+++ b/helpcontent2/source/auxiliary/km/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Khmer OS System","Khmer OS",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Khmer OS System","Khmer OS","Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Khmer OS System","Khmer OS",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Khmer OS System","Khmer OS","Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/km/highcontrast1.css b/helpcontent2/source/auxiliary/km/highcontrast1.css
index ef7e324f67..c927a91d5d 100644
--- a/helpcontent2/source/auxiliary/km/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/km/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Khmer OS System","Khmer OS",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Khmer OS System","Khmer OS","Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Khmer OS System","Khmer OS",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Khmer OS System","Khmer OS","Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/km/highcontrast2.css b/helpcontent2/source/auxiliary/km/highcontrast2.css
index 2a1f5aeec7..0e0966c0bc 100644
--- a/helpcontent2/source/auxiliary/km/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/km/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Khmer OS System","Khmer OS",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Khmer OS System","Khmer OS","Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Khmer OS System","Khmer OS",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Khmer OS System","Khmer OS","Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/km/highcontrastblack.css b/helpcontent2/source/auxiliary/km/highcontrastblack.css
index 84fe373ff2..3b89a1cd83 100644
--- a/helpcontent2/source/auxiliary/km/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/km/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Khmer OS System","Khmer OS",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Khmer OS System","Khmer OS","Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Khmer OS System","Khmer OS",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Khmer OS System","Khmer OS","Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/km/highcontrastwhite.css b/helpcontent2/source/auxiliary/km/highcontrastwhite.css
index 44f6a79eb4..a850c7a0bd 100644
--- a/helpcontent2/source/auxiliary/km/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/km/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Khmer OS System","Khmer OS",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Khmer OS System","Khmer OS","Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Khmer OS System","Khmer OS",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Khmer OS System","Khmer OS","Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/km/sbasic.cfg b/helpcontent2/source/auxiliary/km/sbasic.cfg
index 389aeb60eb..0abc235cac 100644
--- a/helpcontent2/source/auxiliary/km/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/km/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/km/scalc.cfg b/helpcontent2/source/auxiliary/km/scalc.cfg
index 7d069c3f89..4aff7f0944 100644
--- a/helpcontent2/source/auxiliary/km/scalc.cfg
+++ b/helpcontent2/source/auxiliary/km/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/km/schart.cfg b/helpcontent2/source/auxiliary/km/schart.cfg
index 8f0072ac09..a1c048be69 100755..100644
--- a/helpcontent2/source/auxiliary/km/schart.cfg
+++ b/helpcontent2/source/auxiliary/km/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/km/sdatabase.cfg b/helpcontent2/source/auxiliary/km/sdatabase.cfg
index 9d11ab4f69..5844d5a052 100644
--- a/helpcontent2/source/auxiliary/km/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/km/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/km/sdraw.cfg b/helpcontent2/source/auxiliary/km/sdraw.cfg
index 9d9113a3e5..a46a127f12 100644
--- a/helpcontent2/source/auxiliary/km/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/km/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/km/simpress.cfg b/helpcontent2/source/auxiliary/km/simpress.cfg
index ed3220cc5f..7a9f5ce55a 100644
--- a/helpcontent2/source/auxiliary/km/simpress.cfg
+++ b/helpcontent2/source/auxiliary/km/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/km/smath.cfg b/helpcontent2/source/auxiliary/km/smath.cfg
index 15766c0a90..e15de41f5c 100644
--- a/helpcontent2/source/auxiliary/km/smath.cfg
+++ b/helpcontent2/source/auxiliary/km/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/km/swriter.cfg b/helpcontent2/source/auxiliary/km/swriter.cfg
index c6ee960f1a..a59037936a 100644
--- a/helpcontent2/source/auxiliary/km/swriter.cfg
+++ b/helpcontent2/source/auxiliary/km/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/kn/default.css b/helpcontent2/source/auxiliary/kn/default.css
new file mode 100644
index 0000000000..bcdc5f4e61
--- /dev/null
+++ b/helpcontent2/source/auxiliary/kn/default.css
@@ -0,0 +1,73 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                          DEFAULT STYLESHEET                       +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold; }
+
+.related
+	{ font-weight: bold; margin-top:20pt; border-top: 1px solid black;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; border: 1px solid #999999; background: #FFFFFF; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; margin-top: 2px; margin-bottom: 2px;}
+
+h1
+	{ font-size: 18pt; border-bottom: 1px solid black; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.howtoget
+	{ background:#EEEEEE;}
+
+.howtogetbody
+	{ background:#EEEEEE; margin: 0px;}
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+.debug
+	{ border: 1px solid black; padding: 3px; display: none;}
diff --git a/helpcontent2/source/auxiliary/kn/highcontrast1.css b/helpcontent2/source/auxiliary/kn/highcontrast1.css
new file mode 100644
index 0000000000..1b44518acd
--- /dev/null
+++ b/helpcontent2/source/auxiliary/kn/highcontrast1.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #1 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFF00;}
+
+.related 
+	{ border-top: 1px solid #FFFF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/kn/highcontrast2.css b/helpcontent2/source/auxiliary/kn/highcontrast2.css
new file mode 100644
index 0000000000..6f934a4196
--- /dev/null
+++ b/helpcontent2/source/auxiliary/kn/highcontrast2.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #2 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #00FF00;}
+
+.related 
+	{ border-top: 1px solid #00FF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #00FF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #00FF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/kn/highcontrastblack.css b/helpcontent2/source/auxiliary/kn/highcontrastblack.css
new file mode 100644
index 0000000000..87c4b7e310
--- /dev/null
+++ b/helpcontent2/source/auxiliary/kn/highcontrastblack.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST BLACK STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFFFF;}
+
+.related 
+	{ border-top: 1px solid #FFFFFF; }
+
+.howtogetheader
+	{border: 1px solid #FFFFFF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFFFF; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFFFF; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/kn/highcontrastwhite.css b/helpcontent2/source/auxiliary/kn/highcontrastwhite.css
new file mode 100644
index 0000000000..9c8bbe469e
--- /dev/null
+++ b/helpcontent2/source/auxiliary/kn/highcontrastwhite.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST WHITE STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #FFFFFF; color: #000000;}
+
+.related 
+	{ border-top: 1px solid #000000; }
+
+.howtogetheader
+	{border: 1px solid #000000; background: #FFFFFF;}
+
+h1 
+	{ border-bottom: 1px solid #000000; ]
+
+.howtoget
+	{ background:#FFFFFF;}
+
+.howtogetbody
+	{ background:#FFFFFF;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #000000; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/kn/sbasic.cfg b/helpcontent2/source/auxiliary/kn/sbasic.cfg
new file mode 100644
index 0000000000..d0a031563e
--- /dev/null
+++ b/helpcontent2/source/auxiliary/kn/sbasic.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Basic
+
+Language=kn
+Order=7
+Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
+Heading=headingheading
+Program=BASIC 
diff --git a/helpcontent2/source/auxiliary/kn/scalc.cfg b/helpcontent2/source/auxiliary/kn/scalc.cfg
new file mode 100644
index 0000000000..3c36ecc4b6
--- /dev/null
+++ b/helpcontent2/source/auxiliary/kn/scalc.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Calc
+
+Language=kn
+Order=3
+Start=text%2Fscalc%2Fmain0000.xhp
+Heading=headingheading
+Program=CALC
diff --git a/helpcontent2/source/auxiliary/kn/schart.cfg b/helpcontent2/source/auxiliary/kn/schart.cfg
new file mode 100644
index 0000000000..7c71261296
--- /dev/null
+++ b/helpcontent2/source/auxiliary/kn/schart.cfg
@@ -0,0 +1,8 @@
+Title=%PRODUCTNAME Chart
+
+Language=kn
+Order=4
+Start=text%2Fschart%2Fmain0000.xhp
+Heading=headingheading
+Program=CHART
+
diff --git a/helpcontent2/source/auxiliary/kn/sdatabase.cfg b/helpcontent2/source/auxiliary/kn/sdatabase.cfg
new file mode 100644
index 0000000000..2d4dbe9570
--- /dev/null
+++ b/helpcontent2/source/auxiliary/kn/sdatabase.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Base
+
+Language=kn
+Order=7
+Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
+Heading=headingheading
+Program=DATABASE 
diff --git a/helpcontent2/source/auxiliary/kn/sdraw.cfg b/helpcontent2/source/auxiliary/kn/sdraw.cfg
new file mode 100644
index 0000000000..b6ff6f8502
--- /dev/null
+++ b/helpcontent2/source/auxiliary/kn/sdraw.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Draw
+
+Language=kn
+Order=4
+Start=text%2Fsdraw%2Fmain0000.xhp
+Heading=headingheading
+Program=DRAW
diff --git a/helpcontent2/source/auxiliary/kn/simpress.cfg b/helpcontent2/source/auxiliary/kn/simpress.cfg
new file mode 100644
index 0000000000..856a369d86
--- /dev/null
+++ b/helpcontent2/source/auxiliary/kn/simpress.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Impress
+
+Language=kn
+Order=5
+Start=text%2Fsimpress%2Fmain0000.xhp
+Heading=headingheading
+Program=IMPRESS
diff --git a/helpcontent2/source/auxiliary/kn/smath.cfg b/helpcontent2/source/auxiliary/kn/smath.cfg
new file mode 100644
index 0000000000..db7cb12d45
--- /dev/null
+++ b/helpcontent2/source/auxiliary/kn/smath.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Math
+
+Language=kn
+Order=6
+Start=text%2Fsmath%2Fmain0000.xhp
+Heading=headingheading
+Program=MATH
diff --git a/helpcontent2/source/auxiliary/kn/swriter.cfg b/helpcontent2/source/auxiliary/kn/swriter.cfg
new file mode 100644
index 0000000000..a82200026d
--- /dev/null
+++ b/helpcontent2/source/auxiliary/kn/swriter.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Writer
+
+Language=kn
+Order=2
+Start=text%2Fswriter%2Fmain0000.xhp
+Heading=headingheading
+Program=WRITER
diff --git a/helpcontent2/source/auxiliary/ko/default.css b/helpcontent2/source/auxiliary/ko/default.css
index ebbd19f9f2..a94fa79332 100755..100644
--- a/helpcontent2/source/auxiliary/ko/default.css
+++ b/helpcontent2/source/auxiliary/ko/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable  
-	{ font-family: 썬굴림,SunGulim,Gulim,Andale Sans UI,Arial Unicode MS,Lucida Sans Unicode,Tahoma,Albany,Arial,Helvetica,Lucida,Geneva,Helmet,SansSerif; }
+	{ font-family: 썬굴림,SunGulim,Gulim,Andale Sans UI,Arial Unicode MS,Lucida Sans Unicode,Tahoma,"Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,Helmet,SansSerif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: 썬굴림,SunGulim,Cumberland,Courier New,Courier,Lucida Sans Typewriter,Lucida Typewriter,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: 썬굴림,SunGulim,"Cumberland AMT",Cumberland,Courier New,Courier,Lucida Sans Typewriter,Lucida Typewriter,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/ko/highcontrast1.css b/helpcontent2/source/auxiliary/ko/highcontrast1.css
index a4117ad976..abd97c3a8a 100755..100644
--- a/helpcontent2/source/auxiliary/ko/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/ko/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable  
-	{ font-family: 썬굴림,SunGulim,Gulim,Andale Sans UI,Arial Unicode MS,Lucida Sans Unicode,Tahoma,Albany,Arial,Helvetica,Lucida,Geneva,Helmet,SansSerif; }
+	{ font-family: 썬굴림,SunGulim,Gulim,Andale Sans UI,Arial Unicode MS,Lucida Sans Unicode,Tahoma,"Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,Helmet,SansSerif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: 썬굴림,SunGulim,Cumberland,Courier New,Courier,Lucida Sans Typewriter,Lucida Typewriter,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: 썬굴림,SunGulim,"Cumberland AMT",Cumberland,Courier New,Courier,Lucida Sans Typewriter,Lucida Typewriter,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/ko/highcontrast2.css b/helpcontent2/source/auxiliary/ko/highcontrast2.css
index 53a72dfe85..4376b928fb 100755..100644
--- a/helpcontent2/source/auxiliary/ko/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/ko/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable  
-	{ font-family: 썬굴림,SunGulim,Gulim,Andale Sans UI,Arial Unicode MS,Lucida Sans Unicode,Tahoma,Albany,Arial,Helvetica,Lucida,Geneva,Helmet,SansSerif; }
+	{ font-family: 썬굴림,SunGulim,Gulim,Andale Sans UI,Arial Unicode MS,Lucida Sans Unicode,Tahoma,"Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,Helmet,SansSerif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: 썬굴림,SunGulim,Cumberland,Courier New,Courier,Lucida Sans Typewriter,Lucida Typewriter,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: 썬굴림,SunGulim,"Cumberland AMT",Cumberland,Courier New,Courier,Lucida Sans Typewriter,Lucida Typewriter,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/ko/highcontrastblack.css b/helpcontent2/source/auxiliary/ko/highcontrastblack.css
index f23fe0d6a0..517ec03769 100755..100644
--- a/helpcontent2/source/auxiliary/ko/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/ko/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable  
-	{ font-family: 썬굴림,SunGulim,Gulim,Andale Sans UI,Arial Unicode MS,Lucida Sans Unicode,Tahoma,Albany,Arial,Helvetica,Lucida,Geneva,Helmet,SansSerif; }
+	{ font-family: 썬굴림,SunGulim,Gulim,Andale Sans UI,Arial Unicode MS,Lucida Sans Unicode,Tahoma,"Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,Helmet,SansSerif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: 썬굴림,SunGulim,Cumberland,Courier New,Courier,Lucida Sans Typewriter,Lucida Typewriter,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: 썬굴림,SunGulim,"Cumberland AMT",Cumberland,Courier New,Courier,Lucida Sans Typewriter,Lucida Typewriter,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/ko/highcontrastwhite.css b/helpcontent2/source/auxiliary/ko/highcontrastwhite.css
index 9f23a0a74a..d961efbf68 100755..100644
--- a/helpcontent2/source/auxiliary/ko/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/ko/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable  
-	{ font-family: 썬굴림,SunGulim,Gulim,Andale Sans UI,Arial Unicode MS,Lucida Sans Unicode,Tahoma,Albany,Arial,Helvetica,Lucida,Geneva,Helmet,SansSerif; }
+	{ font-family: 썬굴림,SunGulim,Gulim,Andale Sans UI,Arial Unicode MS,Lucida Sans Unicode,Tahoma,"Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,Helmet,SansSerif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: 썬굴림,SunGulim,Cumberland,Courier New,Courier,Lucida Sans Typewriter,Lucida Typewriter,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: 썬굴림,SunGulim,"Cumberland AMT",Cumberland,Courier New,Courier,Lucida Sans Typewriter,Lucida Typewriter,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/ko/sbasic.cfg b/helpcontent2/source/auxiliary/ko/sbasic.cfg
index 1a6574293d..ed0e0cf36a 100755..100644
--- a/helpcontent2/source/auxiliary/ko/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/ko/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ko/scalc.cfg b/helpcontent2/source/auxiliary/ko/scalc.cfg
index df5d7ae2a2..84669258d3 100755..100644
--- a/helpcontent2/source/auxiliary/ko/scalc.cfg
+++ b/helpcontent2/source/auxiliary/ko/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ko/schart.cfg b/helpcontent2/source/auxiliary/ko/schart.cfg
index 71e4fc830a..27333d0ce6 100755..100644
--- a/helpcontent2/source/auxiliary/ko/schart.cfg
+++ b/helpcontent2/source/auxiliary/ko/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/ko/sdatabase.cfg b/helpcontent2/source/auxiliary/ko/sdatabase.cfg
index 518fa31f4d..eb5cb31639 100644
--- a/helpcontent2/source/auxiliary/ko/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/ko/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ko/sdraw.cfg b/helpcontent2/source/auxiliary/ko/sdraw.cfg
index b2ee6c2b1f..5f1f209605 100755..100644
--- a/helpcontent2/source/auxiliary/ko/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/ko/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ko/simpress.cfg b/helpcontent2/source/auxiliary/ko/simpress.cfg
index 55530f35c9..a60e5908c8 100755..100644
--- a/helpcontent2/source/auxiliary/ko/simpress.cfg
+++ b/helpcontent2/source/auxiliary/ko/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ko/smath.cfg b/helpcontent2/source/auxiliary/ko/smath.cfg
index b3a59a5cac..91db56c0bc 100755..100644
--- a/helpcontent2/source/auxiliary/ko/smath.cfg
+++ b/helpcontent2/source/auxiliary/ko/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ko/swriter.cfg b/helpcontent2/source/auxiliary/ko/swriter.cfg
index 49e564b452..2267c1376f 100755..100644
--- a/helpcontent2/source/auxiliary/ko/swriter.cfg
+++ b/helpcontent2/source/auxiliary/ko/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/kok/default.css b/helpcontent2/source/auxiliary/kok/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/kok/default.css
+++ b/helpcontent2/source/auxiliary/kok/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/kok/highcontrast1.css b/helpcontent2/source/auxiliary/kok/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/kok/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/kok/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/kok/highcontrast2.css b/helpcontent2/source/auxiliary/kok/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/kok/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/kok/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/kok/highcontrastblack.css b/helpcontent2/source/auxiliary/kok/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/kok/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/kok/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/kok/highcontrastwhite.css b/helpcontent2/source/auxiliary/kok/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/kok/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/kok/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/kok/sbasic.cfg b/helpcontent2/source/auxiliary/kok/sbasic.cfg
index 0b429c0106..8f87f5a10c 100644
--- a/helpcontent2/source/auxiliary/kok/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/kok/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/kok/scalc.cfg b/helpcontent2/source/auxiliary/kok/scalc.cfg
index 8d83786ccc..219b5528cc 100644
--- a/helpcontent2/source/auxiliary/kok/scalc.cfg
+++ b/helpcontent2/source/auxiliary/kok/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/kok/schart.cfg b/helpcontent2/source/auxiliary/kok/schart.cfg
index 4550b40ffd..dd52846b8a 100644
--- a/helpcontent2/source/auxiliary/kok/schart.cfg
+++ b/helpcontent2/source/auxiliary/kok/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/kok/sdatabase.cfg b/helpcontent2/source/auxiliary/kok/sdatabase.cfg
index 98589ce99f..189838a300 100644
--- a/helpcontent2/source/auxiliary/kok/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/kok/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/kok/sdraw.cfg b/helpcontent2/source/auxiliary/kok/sdraw.cfg
index 87902c0940..e635dabb1f 100644
--- a/helpcontent2/source/auxiliary/kok/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/kok/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/kok/simpress.cfg b/helpcontent2/source/auxiliary/kok/simpress.cfg
index abaecdf2ea..08d557d5dc 100644
--- a/helpcontent2/source/auxiliary/kok/simpress.cfg
+++ b/helpcontent2/source/auxiliary/kok/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/kok/smath.cfg b/helpcontent2/source/auxiliary/kok/smath.cfg
index 4602f637e6..9c8841eda5 100644
--- a/helpcontent2/source/auxiliary/kok/smath.cfg
+++ b/helpcontent2/source/auxiliary/kok/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/kok/swriter.cfg b/helpcontent2/source/auxiliary/kok/swriter.cfg
index 678a2b8055..faf974e5f4 100644
--- a/helpcontent2/source/auxiliary/kok/swriter.cfg
+++ b/helpcontent2/source/auxiliary/kok/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ks/default.css b/helpcontent2/source/auxiliary/ks/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/ks/default.css
+++ b/helpcontent2/source/auxiliary/ks/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/ks/highcontrast1.css b/helpcontent2/source/auxiliary/ks/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/ks/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/ks/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ks/highcontrast2.css b/helpcontent2/source/auxiliary/ks/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/ks/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/ks/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ks/highcontrastblack.css b/helpcontent2/source/auxiliary/ks/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/ks/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/ks/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ks/highcontrastwhite.css b/helpcontent2/source/auxiliary/ks/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/ks/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/ks/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ks/sbasic.cfg b/helpcontent2/source/auxiliary/ks/sbasic.cfg
index d66634002f..f2660d13a9 100644
--- a/helpcontent2/source/auxiliary/ks/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/ks/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ks/scalc.cfg b/helpcontent2/source/auxiliary/ks/scalc.cfg
index c91ee85935..a70def8cd2 100644
--- a/helpcontent2/source/auxiliary/ks/scalc.cfg
+++ b/helpcontent2/source/auxiliary/ks/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ks/schart.cfg b/helpcontent2/source/auxiliary/ks/schart.cfg
index 52de988221..44addeb504 100644
--- a/helpcontent2/source/auxiliary/ks/schart.cfg
+++ b/helpcontent2/source/auxiliary/ks/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/ks/sdatabase.cfg b/helpcontent2/source/auxiliary/ks/sdatabase.cfg
index c630dc016b..68d2c55cba 100644
--- a/helpcontent2/source/auxiliary/ks/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/ks/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ks/sdraw.cfg b/helpcontent2/source/auxiliary/ks/sdraw.cfg
index 788104e7f3..531fb5350b 100644
--- a/helpcontent2/source/auxiliary/ks/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/ks/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ks/simpress.cfg b/helpcontent2/source/auxiliary/ks/simpress.cfg
index d053162728..5699064a87 100644
--- a/helpcontent2/source/auxiliary/ks/simpress.cfg
+++ b/helpcontent2/source/auxiliary/ks/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ks/smath.cfg b/helpcontent2/source/auxiliary/ks/smath.cfg
index 1d656712ae..8d0fa89b0b 100644
--- a/helpcontent2/source/auxiliary/ks/smath.cfg
+++ b/helpcontent2/source/auxiliary/ks/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ks/swriter.cfg b/helpcontent2/source/auxiliary/ks/swriter.cfg
index c510bfe788..4ac1647b24 100644
--- a/helpcontent2/source/auxiliary/ks/swriter.cfg
+++ b/helpcontent2/source/auxiliary/ks/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ku/default.css b/helpcontent2/source/auxiliary/ku/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/ku/default.css
+++ b/helpcontent2/source/auxiliary/ku/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/ku/highcontrast1.css b/helpcontent2/source/auxiliary/ku/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/ku/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/ku/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ku/highcontrast2.css b/helpcontent2/source/auxiliary/ku/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/ku/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/ku/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ku/highcontrastblack.css b/helpcontent2/source/auxiliary/ku/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/ku/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/ku/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ku/highcontrastwhite.css b/helpcontent2/source/auxiliary/ku/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/ku/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/ku/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ku/sbasic.cfg b/helpcontent2/source/auxiliary/ku/sbasic.cfg
index 243304b14e..504055e26c 100755..100644
--- a/helpcontent2/source/auxiliary/ku/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/ku/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ku/scalc.cfg b/helpcontent2/source/auxiliary/ku/scalc.cfg
index 3f87cdd2df..62de753c82 100755..100644
--- a/helpcontent2/source/auxiliary/ku/scalc.cfg
+++ b/helpcontent2/source/auxiliary/ku/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ku/schart.cfg b/helpcontent2/source/auxiliary/ku/schart.cfg
index 4fc9b66988..4816c2291e 100755..100644
--- a/helpcontent2/source/auxiliary/ku/schart.cfg
+++ b/helpcontent2/source/auxiliary/ku/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/ku/sdatabase.cfg b/helpcontent2/source/auxiliary/ku/sdatabase.cfg
index 05e126d40c..48b559abaf 100644
--- a/helpcontent2/source/auxiliary/ku/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/ku/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ku/sdraw.cfg b/helpcontent2/source/auxiliary/ku/sdraw.cfg
index b45bf679f1..33b6f6b9ce 100755..100644
--- a/helpcontent2/source/auxiliary/ku/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/ku/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ku/simpress.cfg b/helpcontent2/source/auxiliary/ku/simpress.cfg
index 8587354878..e05c7e24e0 100755..100644
--- a/helpcontent2/source/auxiliary/ku/simpress.cfg
+++ b/helpcontent2/source/auxiliary/ku/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ku/smath.cfg b/helpcontent2/source/auxiliary/ku/smath.cfg
index 3dcad8cf99..b8e3000074 100755..100644
--- a/helpcontent2/source/auxiliary/ku/smath.cfg
+++ b/helpcontent2/source/auxiliary/ku/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ku/swriter.cfg b/helpcontent2/source/auxiliary/ku/swriter.cfg
index 029d3c4b28..4923bece3a 100755..100644
--- a/helpcontent2/source/auxiliary/ku/swriter.cfg
+++ b/helpcontent2/source/auxiliary/ku/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/lo/default.css b/helpcontent2/source/auxiliary/lo/default.css
new file mode 100644
index 0000000000..bcdc5f4e61
--- /dev/null
+++ b/helpcontent2/source/auxiliary/lo/default.css
@@ -0,0 +1,73 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                          DEFAULT STYLESHEET                       +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold; }
+
+.related
+	{ font-weight: bold; margin-top:20pt; border-top: 1px solid black;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; border: 1px solid #999999; background: #FFFFFF; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; margin-top: 2px; margin-bottom: 2px;}
+
+h1
+	{ font-size: 18pt; border-bottom: 1px solid black; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.howtoget
+	{ background:#EEEEEE;}
+
+.howtogetbody
+	{ background:#EEEEEE; margin: 0px;}
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+.debug
+	{ border: 1px solid black; padding: 3px; display: none;}
diff --git a/helpcontent2/source/auxiliary/lo/highcontrast1.css b/helpcontent2/source/auxiliary/lo/highcontrast1.css
new file mode 100644
index 0000000000..1b44518acd
--- /dev/null
+++ b/helpcontent2/source/auxiliary/lo/highcontrast1.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #1 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFF00;}
+
+.related 
+	{ border-top: 1px solid #FFFF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/lo/highcontrast2.css b/helpcontent2/source/auxiliary/lo/highcontrast2.css
new file mode 100644
index 0000000000..6f934a4196
--- /dev/null
+++ b/helpcontent2/source/auxiliary/lo/highcontrast2.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #2 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #00FF00;}
+
+.related 
+	{ border-top: 1px solid #00FF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #00FF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #00FF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/lo/highcontrastblack.css b/helpcontent2/source/auxiliary/lo/highcontrastblack.css
new file mode 100644
index 0000000000..87c4b7e310
--- /dev/null
+++ b/helpcontent2/source/auxiliary/lo/highcontrastblack.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST BLACK STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFFFF;}
+
+.related 
+	{ border-top: 1px solid #FFFFFF; }
+
+.howtogetheader
+	{border: 1px solid #FFFFFF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFFFF; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFFFF; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/lo/highcontrastwhite.css b/helpcontent2/source/auxiliary/lo/highcontrastwhite.css
new file mode 100644
index 0000000000..9c8bbe469e
--- /dev/null
+++ b/helpcontent2/source/auxiliary/lo/highcontrastwhite.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST WHITE STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #FFFFFF; color: #000000;}
+
+.related 
+	{ border-top: 1px solid #000000; }
+
+.howtogetheader
+	{border: 1px solid #000000; background: #FFFFFF;}
+
+h1 
+	{ border-bottom: 1px solid #000000; ]
+
+.howtoget
+	{ background:#FFFFFF;}
+
+.howtogetbody
+	{ background:#FFFFFF;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #000000; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/lo/sbasic.cfg b/helpcontent2/source/auxiliary/lo/sbasic.cfg
new file mode 100644
index 0000000000..a6ea5c1c90
--- /dev/null
+++ b/helpcontent2/source/auxiliary/lo/sbasic.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Basic
+
+Language=lo
+Order=7
+Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
+Heading=headingheading
+Program=BASIC 
diff --git a/helpcontent2/source/auxiliary/lo/scalc.cfg b/helpcontent2/source/auxiliary/lo/scalc.cfg
new file mode 100644
index 0000000000..a14744619d
--- /dev/null
+++ b/helpcontent2/source/auxiliary/lo/scalc.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Calc
+
+Language=lo
+Order=3
+Start=text%2Fscalc%2Fmain0000.xhp
+Heading=headingheading
+Program=CALC
diff --git a/helpcontent2/source/auxiliary/lo/schart.cfg b/helpcontent2/source/auxiliary/lo/schart.cfg
new file mode 100644
index 0000000000..ebf92396cf
--- /dev/null
+++ b/helpcontent2/source/auxiliary/lo/schart.cfg
@@ -0,0 +1,8 @@
+Title=%PRODUCTNAME Chart
+
+Language=lo
+Order=4
+Start=text%2Fschart%2Fmain0000.xhp
+Heading=headingheading
+Program=CHART
+
diff --git a/helpcontent2/source/auxiliary/lo/sdatabase.cfg b/helpcontent2/source/auxiliary/lo/sdatabase.cfg
new file mode 100644
index 0000000000..39bf53c86f
--- /dev/null
+++ b/helpcontent2/source/auxiliary/lo/sdatabase.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Base
+
+Language=lo
+Order=7
+Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
+Heading=headingheading
+Program=DATABASE 
diff --git a/helpcontent2/source/auxiliary/lo/sdraw.cfg b/helpcontent2/source/auxiliary/lo/sdraw.cfg
new file mode 100644
index 0000000000..74c8721f24
--- /dev/null
+++ b/helpcontent2/source/auxiliary/lo/sdraw.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Draw
+
+Language=lo
+Order=4
+Start=text%2Fsdraw%2Fmain0000.xhp
+Heading=headingheading
+Program=DRAW
diff --git a/helpcontent2/source/auxiliary/lo/simpress.cfg b/helpcontent2/source/auxiliary/lo/simpress.cfg
new file mode 100644
index 0000000000..9dbff02a62
--- /dev/null
+++ b/helpcontent2/source/auxiliary/lo/simpress.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Impress
+
+Language=lo
+Order=5
+Start=text%2Fsimpress%2Fmain0000.xhp
+Heading=headingheading
+Program=IMPRESS
diff --git a/helpcontent2/source/auxiliary/lo/smath.cfg b/helpcontent2/source/auxiliary/lo/smath.cfg
new file mode 100644
index 0000000000..4566f3bb0d
--- /dev/null
+++ b/helpcontent2/source/auxiliary/lo/smath.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Math
+
+Language=lo
+Order=6
+Start=text%2Fsmath%2Fmain0000.xhp
+Heading=headingheading
+Program=MATH
diff --git a/helpcontent2/source/auxiliary/lo/swriter.cfg b/helpcontent2/source/auxiliary/lo/swriter.cfg
new file mode 100644
index 0000000000..fddf4ed030
--- /dev/null
+++ b/helpcontent2/source/auxiliary/lo/swriter.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Writer
+
+Language=lo
+Order=2
+Start=text%2Fswriter%2Fmain0000.xhp
+Heading=headingheading
+Program=WRITER
diff --git a/helpcontent2/source/auxiliary/lt/default.css b/helpcontent2/source/auxiliary/lt/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/lt/default.css
+++ b/helpcontent2/source/auxiliary/lt/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/lt/highcontrast1.css b/helpcontent2/source/auxiliary/lt/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/lt/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/lt/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/lt/highcontrast2.css b/helpcontent2/source/auxiliary/lt/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/lt/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/lt/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/lt/highcontrastblack.css b/helpcontent2/source/auxiliary/lt/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/lt/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/lt/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/lt/highcontrastwhite.css b/helpcontent2/source/auxiliary/lt/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/lt/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/lt/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/lt/sbasic.cfg b/helpcontent2/source/auxiliary/lt/sbasic.cfg
index 69990df824..4e3e3ddfbd 100644
--- a/helpcontent2/source/auxiliary/lt/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/lt/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/lt/scalc.cfg b/helpcontent2/source/auxiliary/lt/scalc.cfg
index 571fdc9745..01b23326d2 100644
--- a/helpcontent2/source/auxiliary/lt/scalc.cfg
+++ b/helpcontent2/source/auxiliary/lt/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/lt/schart.cfg b/helpcontent2/source/auxiliary/lt/schart.cfg
index bed952885a..0025ca2732 100755..100644
--- a/helpcontent2/source/auxiliary/lt/schart.cfg
+++ b/helpcontent2/source/auxiliary/lt/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/lt/sdatabase.cfg b/helpcontent2/source/auxiliary/lt/sdatabase.cfg
index ec2623afb1..b7117e8267 100644
--- a/helpcontent2/source/auxiliary/lt/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/lt/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/lt/sdraw.cfg b/helpcontent2/source/auxiliary/lt/sdraw.cfg
index 5279e69c46..5d9013447b 100644
--- a/helpcontent2/source/auxiliary/lt/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/lt/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/lt/simpress.cfg b/helpcontent2/source/auxiliary/lt/simpress.cfg
index 43d5804625..54b6382f22 100644
--- a/helpcontent2/source/auxiliary/lt/simpress.cfg
+++ b/helpcontent2/source/auxiliary/lt/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/lt/smath.cfg b/helpcontent2/source/auxiliary/lt/smath.cfg
index aceac7ca0a..85118d897e 100644
--- a/helpcontent2/source/auxiliary/lt/smath.cfg
+++ b/helpcontent2/source/auxiliary/lt/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/lt/swriter.cfg b/helpcontent2/source/auxiliary/lt/swriter.cfg
index c25494b13b..942871f0a6 100644
--- a/helpcontent2/source/auxiliary/lt/swriter.cfg
+++ b/helpcontent2/source/auxiliary/lt/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/lv/default.css b/helpcontent2/source/auxiliary/lv/default.css
new file mode 100644
index 0000000000..bcdc5f4e61
--- /dev/null
+++ b/helpcontent2/source/auxiliary/lv/default.css
@@ -0,0 +1,73 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                          DEFAULT STYLESHEET                       +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold; }
+
+.related
+	{ font-weight: bold; margin-top:20pt; border-top: 1px solid black;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; border: 1px solid #999999; background: #FFFFFF; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; margin-top: 2px; margin-bottom: 2px;}
+
+h1
+	{ font-size: 18pt; border-bottom: 1px solid black; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.howtoget
+	{ background:#EEEEEE;}
+
+.howtogetbody
+	{ background:#EEEEEE; margin: 0px;}
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+.debug
+	{ border: 1px solid black; padding: 3px; display: none;}
diff --git a/helpcontent2/source/auxiliary/lv/highcontrast1.css b/helpcontent2/source/auxiliary/lv/highcontrast1.css
new file mode 100644
index 0000000000..1b44518acd
--- /dev/null
+++ b/helpcontent2/source/auxiliary/lv/highcontrast1.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #1 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFF00;}
+
+.related 
+	{ border-top: 1px solid #FFFF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/lv/highcontrast2.css b/helpcontent2/source/auxiliary/lv/highcontrast2.css
new file mode 100644
index 0000000000..6f934a4196
--- /dev/null
+++ b/helpcontent2/source/auxiliary/lv/highcontrast2.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #2 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #00FF00;}
+
+.related 
+	{ border-top: 1px solid #00FF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #00FF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #00FF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/lv/highcontrastblack.css b/helpcontent2/source/auxiliary/lv/highcontrastblack.css
new file mode 100644
index 0000000000..87c4b7e310
--- /dev/null
+++ b/helpcontent2/source/auxiliary/lv/highcontrastblack.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST BLACK STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFFFF;}
+
+.related 
+	{ border-top: 1px solid #FFFFFF; }
+
+.howtogetheader
+	{border: 1px solid #FFFFFF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFFFF; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFFFF; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/lv/highcontrastwhite.css b/helpcontent2/source/auxiliary/lv/highcontrastwhite.css
new file mode 100644
index 0000000000..9c8bbe469e
--- /dev/null
+++ b/helpcontent2/source/auxiliary/lv/highcontrastwhite.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST WHITE STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #FFFFFF; color: #000000;}
+
+.related 
+	{ border-top: 1px solid #000000; }
+
+.howtogetheader
+	{border: 1px solid #000000; background: #FFFFFF;}
+
+h1 
+	{ border-bottom: 1px solid #000000; ]
+
+.howtoget
+	{ background:#FFFFFF;}
+
+.howtogetbody
+	{ background:#FFFFFF;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #000000; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/lv/sbasic.cfg b/helpcontent2/source/auxiliary/lv/sbasic.cfg
new file mode 100644
index 0000000000..d3d4c741c3
--- /dev/null
+++ b/helpcontent2/source/auxiliary/lv/sbasic.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Basic
+
+Language=lv
+Order=7
+Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
+Heading=headingheading
+Program=BASIC 
diff --git a/helpcontent2/source/auxiliary/lv/scalc.cfg b/helpcontent2/source/auxiliary/lv/scalc.cfg
new file mode 100644
index 0000000000..15abbad294
--- /dev/null
+++ b/helpcontent2/source/auxiliary/lv/scalc.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Calc
+
+Language=lv
+Order=3
+Start=text%2Fscalc%2Fmain0000.xhp
+Heading=headingheading
+Program=CALC
diff --git a/helpcontent2/source/auxiliary/lv/schart.cfg b/helpcontent2/source/auxiliary/lv/schart.cfg
new file mode 100644
index 0000000000..f1c9d57228
--- /dev/null
+++ b/helpcontent2/source/auxiliary/lv/schart.cfg
@@ -0,0 +1,8 @@
+Title=%PRODUCTNAME Chart
+
+Language=lv
+Order=4
+Start=text%2Fschart%2Fmain0000.xhp
+Heading=headingheading
+Program=CHART
+
diff --git a/helpcontent2/source/auxiliary/lv/sdatabase.cfg b/helpcontent2/source/auxiliary/lv/sdatabase.cfg
new file mode 100644
index 0000000000..157df4e079
--- /dev/null
+++ b/helpcontent2/source/auxiliary/lv/sdatabase.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Base
+
+Language=lv
+Order=7
+Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
+Heading=headingheading
+Program=DATABASE 
diff --git a/helpcontent2/source/auxiliary/lv/sdraw.cfg b/helpcontent2/source/auxiliary/lv/sdraw.cfg
new file mode 100644
index 0000000000..d1c78b87d6
--- /dev/null
+++ b/helpcontent2/source/auxiliary/lv/sdraw.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Draw
+
+Language=lv
+Order=4
+Start=text%2Fsdraw%2Fmain0000.xhp
+Heading=headingheading
+Program=DRAW
diff --git a/helpcontent2/source/auxiliary/lv/simpress.cfg b/helpcontent2/source/auxiliary/lv/simpress.cfg
new file mode 100644
index 0000000000..6c4d83865f
--- /dev/null
+++ b/helpcontent2/source/auxiliary/lv/simpress.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Impress
+
+Language=lv
+Order=5
+Start=text%2Fsimpress%2Fmain0000.xhp
+Heading=headingheading
+Program=IMPRESS
diff --git a/helpcontent2/source/auxiliary/lv/smath.cfg b/helpcontent2/source/auxiliary/lv/smath.cfg
new file mode 100644
index 0000000000..a1a8fb4a86
--- /dev/null
+++ b/helpcontent2/source/auxiliary/lv/smath.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Math
+
+Language=lv
+Order=6
+Start=text%2Fsmath%2Fmain0000.xhp
+Heading=headingheading
+Program=MATH
diff --git a/helpcontent2/source/auxiliary/lv/swriter.cfg b/helpcontent2/source/auxiliary/lv/swriter.cfg
new file mode 100644
index 0000000000..dc85c21519
--- /dev/null
+++ b/helpcontent2/source/auxiliary/lv/swriter.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Writer
+
+Language=lv
+Order=2
+Start=text%2Fswriter%2Fmain0000.xhp
+Heading=headingheading
+Program=WRITER
diff --git a/helpcontent2/source/auxiliary/mai/default.css b/helpcontent2/source/auxiliary/mai/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/mai/default.css
+++ b/helpcontent2/source/auxiliary/mai/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/mai/highcontrast1.css b/helpcontent2/source/auxiliary/mai/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/mai/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/mai/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/mai/highcontrast2.css b/helpcontent2/source/auxiliary/mai/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/mai/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/mai/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/mai/highcontrastblack.css b/helpcontent2/source/auxiliary/mai/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/mai/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/mai/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/mai/highcontrastwhite.css b/helpcontent2/source/auxiliary/mai/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/mai/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/mai/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/mai/sbasic.cfg b/helpcontent2/source/auxiliary/mai/sbasic.cfg
index 2886cbc1a7..38b1898db3 100644
--- a/helpcontent2/source/auxiliary/mai/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/mai/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/mai/scalc.cfg b/helpcontent2/source/auxiliary/mai/scalc.cfg
index 3c7124c59a..6cfed77ddf 100644
--- a/helpcontent2/source/auxiliary/mai/scalc.cfg
+++ b/helpcontent2/source/auxiliary/mai/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/mai/schart.cfg b/helpcontent2/source/auxiliary/mai/schart.cfg
index 899e6a0be3..4a50bdcd00 100644
--- a/helpcontent2/source/auxiliary/mai/schart.cfg
+++ b/helpcontent2/source/auxiliary/mai/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/mai/sdatabase.cfg b/helpcontent2/source/auxiliary/mai/sdatabase.cfg
index 7b4b3cf0e6..f0de6ad90f 100644
--- a/helpcontent2/source/auxiliary/mai/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/mai/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/mai/sdraw.cfg b/helpcontent2/source/auxiliary/mai/sdraw.cfg
index fa11326461..91efa1cf8e 100644
--- a/helpcontent2/source/auxiliary/mai/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/mai/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/mai/simpress.cfg b/helpcontent2/source/auxiliary/mai/simpress.cfg
index 4d1f6191df..8135d3711a 100644
--- a/helpcontent2/source/auxiliary/mai/simpress.cfg
+++ b/helpcontent2/source/auxiliary/mai/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/mai/smath.cfg b/helpcontent2/source/auxiliary/mai/smath.cfg
index 882f27da1a..b62a9076b8 100644
--- a/helpcontent2/source/auxiliary/mai/smath.cfg
+++ b/helpcontent2/source/auxiliary/mai/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/mai/swriter.cfg b/helpcontent2/source/auxiliary/mai/swriter.cfg
index 66e82bdedc..18939b7c26 100644
--- a/helpcontent2/source/auxiliary/mai/swriter.cfg
+++ b/helpcontent2/source/auxiliary/mai/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/makefile.mk b/helpcontent2/source/auxiliary/makefile.mk
index 48b02b5d0e..94b1370d48 100644
--- a/helpcontent2/source/auxiliary/makefile.mk
+++ b/helpcontent2/source/auxiliary/makefile.mk
@@ -46,7 +46,7 @@ TREEFILES  = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.EXPORT : LOCALIZESDF LOCALIZATION_FOUND TRYSDF
+.EXPORT : LOCALIZESDF LOCALIZATION_FOUND TRYSDF L10N_MODULE
 
 ALLTAR : aux_dirs $(COMMONMISC)$/treefiles.done $(COMMONBIN)$/helpimg.ilst
 
@@ -54,8 +54,10 @@ ALLTAR : aux_dirs $(COMMONMISC)$/treefiles.done $(COMMONBIN)$/helpimg.ilst
 t_aux_langdirs:=$(shell @find ./ -name "*.cfg" | sed "s/\.\/\///" | sed "s/\.\///" )
 
 aux_langdirs:=$(uniq $(t_aux_langdirs:d:d))
+help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name "helpcontent2" | sed -e "s|/helpcontent2||" -e "s|^.*/||" ) en-US
 
-aux_alllangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j  $i $(NULL))))
+aux_alllangiso_all:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j  $i $(NULL))))
+aux_alllangiso:=$(foreach,i,$(aux_alllangiso_all) $(foreach,j,$(help_exist) $(eq,$i,$j  $i $(NULL))))
 
 WITH_LANG!:=$(aux_alllangiso)
 
@@ -64,6 +66,7 @@ WITH_LANG!:=$(aux_alllangiso)
 LOCTREEFILES:=$(foreach,i,$(aux_alllangiso) $(foreach,j,$(TREEFILES) $(COMMONMISC)$/$i$/$j))
 .ELSE			#IF "$(WITH_LANG)"!=""
 aux_langdirs:=en-US
+help_exist:=en-US
 LOCTREEFILES:=$(foreach,j,$(TREEFILES) $(COMMONMISC)$/en-US$/$j)
 .ENDIF			#IF "$(WITH_LANG)"!=""
 
@@ -92,6 +95,7 @@ $(LOCTREEFILES) : $(COMMONMISC)/unpack.done
 
 aux_dirs .PHONY :
     echo aux_langdirs:=$(aux_langdirs) > $(LOCAL_COMMON_OUT)/inc$/aux_langs.mk
+    echo help_exist:=$(help_exist) > $(LOCAL_COMMON_OUT)/inc$/help_exist.mk
 
 $(COMMONBIN)$/helpimg.ilst .PHONY:
     -$(RM) $@
diff --git a/helpcontent2/source/auxiliary/mk/default.css b/helpcontent2/source/auxiliary/mk/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/mk/default.css
+++ b/helpcontent2/source/auxiliary/mk/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/mk/highcontrast1.css b/helpcontent2/source/auxiliary/mk/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/mk/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/mk/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/mk/highcontrast2.css b/helpcontent2/source/auxiliary/mk/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/mk/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/mk/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/mk/highcontrastblack.css b/helpcontent2/source/auxiliary/mk/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/mk/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/mk/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/mk/highcontrastwhite.css b/helpcontent2/source/auxiliary/mk/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/mk/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/mk/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/mk/sbasic.cfg b/helpcontent2/source/auxiliary/mk/sbasic.cfg
index f581711f9d..b1bc15d9ca 100755..100644
--- a/helpcontent2/source/auxiliary/mk/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/mk/sbasic.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Basic
 
-Language=en-US
+Language=mk
 Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/mk/scalc.cfg b/helpcontent2/source/auxiliary/mk/scalc.cfg
index d9d7962f2d..146c39dca8 100755..100644
--- a/helpcontent2/source/auxiliary/mk/scalc.cfg
+++ b/helpcontent2/source/auxiliary/mk/scalc.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Calc
 
-Language=en-US
+Language=mk
 Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/mk/schart.cfg b/helpcontent2/source/auxiliary/mk/schart.cfg
index c75e48c57f..ff46ecd70e 100755..100644
--- a/helpcontent2/source/auxiliary/mk/schart.cfg
+++ b/helpcontent2/source/auxiliary/mk/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/mk/sdatabase.cfg b/helpcontent2/source/auxiliary/mk/sdatabase.cfg
index 859bbdce98..1e2e1d41a7 100644
--- a/helpcontent2/source/auxiliary/mk/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/mk/sdatabase.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Base
 
-Language=en-US
+Language=mk
 Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/mk/sdraw.cfg b/helpcontent2/source/auxiliary/mk/sdraw.cfg
index 81119c21af..edf9951123 100755..100644
--- a/helpcontent2/source/auxiliary/mk/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/mk/sdraw.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Draw
 
-Language=en-US
+Language=mk
 Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/mk/simpress.cfg b/helpcontent2/source/auxiliary/mk/simpress.cfg
index 827da159a8..6a78cb074a 100755..100644
--- a/helpcontent2/source/auxiliary/mk/simpress.cfg
+++ b/helpcontent2/source/auxiliary/mk/simpress.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Impress
 
-Language=en-US
+Language=mk
 Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/mk/smath.cfg b/helpcontent2/source/auxiliary/mk/smath.cfg
index 53966b5f04..a59b266e2e 100755..100644
--- a/helpcontent2/source/auxiliary/mk/smath.cfg
+++ b/helpcontent2/source/auxiliary/mk/smath.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Math
 
-Language=en-US
+Language=mk
 Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/mk/swriter.cfg b/helpcontent2/source/auxiliary/mk/swriter.cfg
index 5d3baaaad3..0332e7449f 100755..100644
--- a/helpcontent2/source/auxiliary/mk/swriter.cfg
+++ b/helpcontent2/source/auxiliary/mk/swriter.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Writer
 
-Language=en-US
+Language=mk
 Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ml/default.css b/helpcontent2/source/auxiliary/ml/default.css
new file mode 100644
index 0000000000..bcdc5f4e61
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ml/default.css
@@ -0,0 +1,73 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                          DEFAULT STYLESHEET                       +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold; }
+
+.related
+	{ font-weight: bold; margin-top:20pt; border-top: 1px solid black;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; border: 1px solid #999999; background: #FFFFFF; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; margin-top: 2px; margin-bottom: 2px;}
+
+h1
+	{ font-size: 18pt; border-bottom: 1px solid black; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.howtoget
+	{ background:#EEEEEE;}
+
+.howtogetbody
+	{ background:#EEEEEE; margin: 0px;}
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+.debug
+	{ border: 1px solid black; padding: 3px; display: none;}
diff --git a/helpcontent2/source/auxiliary/ml/highcontrast1.css b/helpcontent2/source/auxiliary/ml/highcontrast1.css
new file mode 100644
index 0000000000..1b44518acd
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ml/highcontrast1.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #1 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFF00;}
+
+.related 
+	{ border-top: 1px solid #FFFF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/ml/highcontrast2.css b/helpcontent2/source/auxiliary/ml/highcontrast2.css
new file mode 100644
index 0000000000..6f934a4196
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ml/highcontrast2.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #2 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #00FF00;}
+
+.related 
+	{ border-top: 1px solid #00FF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #00FF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #00FF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/ml/highcontrastblack.css b/helpcontent2/source/auxiliary/ml/highcontrastblack.css
new file mode 100644
index 0000000000..87c4b7e310
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ml/highcontrastblack.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST BLACK STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFFFF;}
+
+.related 
+	{ border-top: 1px solid #FFFFFF; }
+
+.howtogetheader
+	{border: 1px solid #FFFFFF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFFFF; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFFFF; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/ml/highcontrastwhite.css b/helpcontent2/source/auxiliary/ml/highcontrastwhite.css
new file mode 100644
index 0000000000..9c8bbe469e
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ml/highcontrastwhite.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST WHITE STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #FFFFFF; color: #000000;}
+
+.related 
+	{ border-top: 1px solid #000000; }
+
+.howtogetheader
+	{border: 1px solid #000000; background: #FFFFFF;}
+
+h1 
+	{ border-bottom: 1px solid #000000; ]
+
+.howtoget
+	{ background:#FFFFFF;}
+
+.howtogetbody
+	{ background:#FFFFFF;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #000000; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/ml/sbasic.cfg b/helpcontent2/source/auxiliary/ml/sbasic.cfg
new file mode 100644
index 0000000000..4449d11923
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ml/sbasic.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Basic
+
+Language=ml
+Order=7
+Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
+Heading=headingheading
+Program=BASIC 
diff --git a/helpcontent2/source/auxiliary/ml/scalc.cfg b/helpcontent2/source/auxiliary/ml/scalc.cfg
new file mode 100644
index 0000000000..b803224875
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ml/scalc.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Calc
+
+Language=ml
+Order=3
+Start=text%2Fscalc%2Fmain0000.xhp
+Heading=headingheading
+Program=CALC
diff --git a/helpcontent2/source/auxiliary/ml/schart.cfg b/helpcontent2/source/auxiliary/ml/schart.cfg
new file mode 100644
index 0000000000..8ae321669f
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ml/schart.cfg
@@ -0,0 +1,8 @@
+Title=%PRODUCTNAME Chart
+
+Language=ml
+Order=4
+Start=text%2Fschart%2Fmain0000.xhp
+Heading=headingheading
+Program=CHART
+
diff --git a/helpcontent2/source/auxiliary/ml/sdatabase.cfg b/helpcontent2/source/auxiliary/ml/sdatabase.cfg
new file mode 100644
index 0000000000..15e51e31f0
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ml/sdatabase.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Base
+
+Language=ml
+Order=7
+Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
+Heading=headingheading
+Program=DATABASE 
diff --git a/helpcontent2/source/auxiliary/ml/sdraw.cfg b/helpcontent2/source/auxiliary/ml/sdraw.cfg
new file mode 100644
index 0000000000..b1330137cd
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ml/sdraw.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Draw
+
+Language=ml
+Order=4
+Start=text%2Fsdraw%2Fmain0000.xhp
+Heading=headingheading
+Program=DRAW
diff --git a/helpcontent2/source/auxiliary/ml/simpress.cfg b/helpcontent2/source/auxiliary/ml/simpress.cfg
new file mode 100644
index 0000000000..56fdf063a9
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ml/simpress.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Impress
+
+Language=ml
+Order=5
+Start=text%2Fsimpress%2Fmain0000.xhp
+Heading=headingheading
+Program=IMPRESS
diff --git a/helpcontent2/source/auxiliary/ml/smath.cfg b/helpcontent2/source/auxiliary/ml/smath.cfg
new file mode 100644
index 0000000000..60538a13a6
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ml/smath.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Math
+
+Language=ml
+Order=6
+Start=text%2Fsmath%2Fmain0000.xhp
+Heading=headingheading
+Program=MATH
diff --git a/helpcontent2/source/auxiliary/ml/swriter.cfg b/helpcontent2/source/auxiliary/ml/swriter.cfg
new file mode 100644
index 0000000000..fd16989274
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ml/swriter.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Writer
+
+Language=ml
+Order=2
+Start=text%2Fswriter%2Fmain0000.xhp
+Heading=headingheading
+Program=WRITER
diff --git a/helpcontent2/source/auxiliary/mn/default.css b/helpcontent2/source/auxiliary/mn/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/mn/default.css
+++ b/helpcontent2/source/auxiliary/mn/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/mn/highcontrast1.css b/helpcontent2/source/auxiliary/mn/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/mn/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/mn/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/mn/highcontrast2.css b/helpcontent2/source/auxiliary/mn/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/mn/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/mn/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/mn/highcontrastblack.css b/helpcontent2/source/auxiliary/mn/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/mn/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/mn/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/mn/highcontrastwhite.css b/helpcontent2/source/auxiliary/mn/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/mn/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/mn/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/mn/sbasic.cfg b/helpcontent2/source/auxiliary/mn/sbasic.cfg
index bee1a8faed..efbe08886f 100755..100644
--- a/helpcontent2/source/auxiliary/mn/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/mn/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/mn/scalc.cfg b/helpcontent2/source/auxiliary/mn/scalc.cfg
index 71a6adb9e5..f4b5db304c 100755..100644
--- a/helpcontent2/source/auxiliary/mn/scalc.cfg
+++ b/helpcontent2/source/auxiliary/mn/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/mn/schart.cfg b/helpcontent2/source/auxiliary/mn/schart.cfg
index b16a99b276..a9c931a839 100755..100644
--- a/helpcontent2/source/auxiliary/mn/schart.cfg
+++ b/helpcontent2/source/auxiliary/mn/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/mn/sdatabase.cfg b/helpcontent2/source/auxiliary/mn/sdatabase.cfg
index 7db504629d..711e8ed6cc 100644
--- a/helpcontent2/source/auxiliary/mn/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/mn/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/mn/sdraw.cfg b/helpcontent2/source/auxiliary/mn/sdraw.cfg
index 1ab9946a7a..d74de79f54 100755..100644
--- a/helpcontent2/source/auxiliary/mn/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/mn/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/mn/simpress.cfg b/helpcontent2/source/auxiliary/mn/simpress.cfg
index 7a0c99ca55..bc3be159cc 100755..100644
--- a/helpcontent2/source/auxiliary/mn/simpress.cfg
+++ b/helpcontent2/source/auxiliary/mn/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/mn/smath.cfg b/helpcontent2/source/auxiliary/mn/smath.cfg
index ee55c993c7..56c96811cb 100755..100644
--- a/helpcontent2/source/auxiliary/mn/smath.cfg
+++ b/helpcontent2/source/auxiliary/mn/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/mn/swriter.cfg b/helpcontent2/source/auxiliary/mn/swriter.cfg
index 176d950225..ccfa54fa33 100755..100644
--- a/helpcontent2/source/auxiliary/mn/swriter.cfg
+++ b/helpcontent2/source/auxiliary/mn/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/mni/default.css b/helpcontent2/source/auxiliary/mni/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/mni/default.css
+++ b/helpcontent2/source/auxiliary/mni/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/mni/highcontrast1.css b/helpcontent2/source/auxiliary/mni/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/mni/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/mni/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/mni/highcontrast2.css b/helpcontent2/source/auxiliary/mni/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/mni/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/mni/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/mni/highcontrastblack.css b/helpcontent2/source/auxiliary/mni/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/mni/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/mni/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/mni/highcontrastwhite.css b/helpcontent2/source/auxiliary/mni/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/mni/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/mni/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/mni/sbasic.cfg b/helpcontent2/source/auxiliary/mni/sbasic.cfg
index d8cd95bfe8..bf2981a74a 100644
--- a/helpcontent2/source/auxiliary/mni/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/mni/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/mni/scalc.cfg b/helpcontent2/source/auxiliary/mni/scalc.cfg
index 9f4f4f24a2..e0b08270ab 100644
--- a/helpcontent2/source/auxiliary/mni/scalc.cfg
+++ b/helpcontent2/source/auxiliary/mni/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/mni/schart.cfg b/helpcontent2/source/auxiliary/mni/schart.cfg
index d1657fe294..0493ea5c88 100644
--- a/helpcontent2/source/auxiliary/mni/schart.cfg
+++ b/helpcontent2/source/auxiliary/mni/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/mni/sdatabase.cfg b/helpcontent2/source/auxiliary/mni/sdatabase.cfg
index 82e9175413..8811885ec2 100644
--- a/helpcontent2/source/auxiliary/mni/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/mni/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/mni/sdraw.cfg b/helpcontent2/source/auxiliary/mni/sdraw.cfg
index 50ea5a597b..c919354b55 100644
--- a/helpcontent2/source/auxiliary/mni/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/mni/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/mni/simpress.cfg b/helpcontent2/source/auxiliary/mni/simpress.cfg
index b6328ee08a..030fc3f18f 100644
--- a/helpcontent2/source/auxiliary/mni/simpress.cfg
+++ b/helpcontent2/source/auxiliary/mni/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/mni/smath.cfg b/helpcontent2/source/auxiliary/mni/smath.cfg
index 59c8e4cbfb..b5a721f147 100644
--- a/helpcontent2/source/auxiliary/mni/smath.cfg
+++ b/helpcontent2/source/auxiliary/mni/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/mni/swriter.cfg b/helpcontent2/source/auxiliary/mni/swriter.cfg
index 4af512e4c9..04f49378b5 100644
--- a/helpcontent2/source/auxiliary/mni/swriter.cfg
+++ b/helpcontent2/source/auxiliary/mni/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/mr/default.css b/helpcontent2/source/auxiliary/mr/default.css
new file mode 100644
index 0000000000..bcdc5f4e61
--- /dev/null
+++ b/helpcontent2/source/auxiliary/mr/default.css
@@ -0,0 +1,73 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                          DEFAULT STYLESHEET                       +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold; }
+
+.related
+	{ font-weight: bold; margin-top:20pt; border-top: 1px solid black;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; border: 1px solid #999999; background: #FFFFFF; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; margin-top: 2px; margin-bottom: 2px;}
+
+h1
+	{ font-size: 18pt; border-bottom: 1px solid black; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.howtoget
+	{ background:#EEEEEE;}
+
+.howtogetbody
+	{ background:#EEEEEE; margin: 0px;}
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+.debug
+	{ border: 1px solid black; padding: 3px; display: none;}
diff --git a/helpcontent2/source/auxiliary/mr/highcontrast1.css b/helpcontent2/source/auxiliary/mr/highcontrast1.css
new file mode 100644
index 0000000000..1b44518acd
--- /dev/null
+++ b/helpcontent2/source/auxiliary/mr/highcontrast1.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #1 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFF00;}
+
+.related 
+	{ border-top: 1px solid #FFFF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/mr/highcontrast2.css b/helpcontent2/source/auxiliary/mr/highcontrast2.css
new file mode 100644
index 0000000000..6f934a4196
--- /dev/null
+++ b/helpcontent2/source/auxiliary/mr/highcontrast2.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #2 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #00FF00;}
+
+.related 
+	{ border-top: 1px solid #00FF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #00FF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #00FF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/mr/highcontrastblack.css b/helpcontent2/source/auxiliary/mr/highcontrastblack.css
new file mode 100644
index 0000000000..87c4b7e310
--- /dev/null
+++ b/helpcontent2/source/auxiliary/mr/highcontrastblack.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST BLACK STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFFFF;}
+
+.related 
+	{ border-top: 1px solid #FFFFFF; }
+
+.howtogetheader
+	{border: 1px solid #FFFFFF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFFFF; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFFFF; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/mr/highcontrastwhite.css b/helpcontent2/source/auxiliary/mr/highcontrastwhite.css
new file mode 100644
index 0000000000..9c8bbe469e
--- /dev/null
+++ b/helpcontent2/source/auxiliary/mr/highcontrastwhite.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST WHITE STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #FFFFFF; color: #000000;}
+
+.related 
+	{ border-top: 1px solid #000000; }
+
+.howtogetheader
+	{border: 1px solid #000000; background: #FFFFFF;}
+
+h1 
+	{ border-bottom: 1px solid #000000; ]
+
+.howtoget
+	{ background:#FFFFFF;}
+
+.howtogetbody
+	{ background:#FFFFFF;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #000000; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/mr/sbasic.cfg b/helpcontent2/source/auxiliary/mr/sbasic.cfg
new file mode 100644
index 0000000000..521dc8a20e
--- /dev/null
+++ b/helpcontent2/source/auxiliary/mr/sbasic.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Basic
+
+Language=mr
+Order=7
+Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
+Heading=headingheading
+Program=BASIC 
diff --git a/helpcontent2/source/auxiliary/mr/scalc.cfg b/helpcontent2/source/auxiliary/mr/scalc.cfg
new file mode 100644
index 0000000000..130e7b8822
--- /dev/null
+++ b/helpcontent2/source/auxiliary/mr/scalc.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Calc
+
+Language=mr
+Order=3
+Start=text%2Fscalc%2Fmain0000.xhp
+Heading=headingheading
+Program=CALC
diff --git a/helpcontent2/source/auxiliary/mr/schart.cfg b/helpcontent2/source/auxiliary/mr/schart.cfg
new file mode 100644
index 0000000000..c1873d52e4
--- /dev/null
+++ b/helpcontent2/source/auxiliary/mr/schart.cfg
@@ -0,0 +1,8 @@
+Title=%PRODUCTNAME Chart
+
+Language=mr
+Order=4
+Start=text%2Fschart%2Fmain0000.xhp
+Heading=headingheading
+Program=CHART
+
diff --git a/helpcontent2/source/auxiliary/mr/sdatabase.cfg b/helpcontent2/source/auxiliary/mr/sdatabase.cfg
new file mode 100644
index 0000000000..ce6b94de7a
--- /dev/null
+++ b/helpcontent2/source/auxiliary/mr/sdatabase.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Base
+
+Language=mr
+Order=7
+Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
+Heading=headingheading
+Program=DATABASE 
diff --git a/helpcontent2/source/auxiliary/mr/sdraw.cfg b/helpcontent2/source/auxiliary/mr/sdraw.cfg
new file mode 100644
index 0000000000..53ebeca51f
--- /dev/null
+++ b/helpcontent2/source/auxiliary/mr/sdraw.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Draw
+
+Language=mr
+Order=4
+Start=text%2Fsdraw%2Fmain0000.xhp
+Heading=headingheading
+Program=DRAW
diff --git a/helpcontent2/source/auxiliary/mr/simpress.cfg b/helpcontent2/source/auxiliary/mr/simpress.cfg
new file mode 100644
index 0000000000..c49ecd4a03
--- /dev/null
+++ b/helpcontent2/source/auxiliary/mr/simpress.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Impress
+
+Language=mr
+Order=5
+Start=text%2Fsimpress%2Fmain0000.xhp
+Heading=headingheading
+Program=IMPRESS
diff --git a/helpcontent2/source/auxiliary/mr/smath.cfg b/helpcontent2/source/auxiliary/mr/smath.cfg
new file mode 100644
index 0000000000..7a32ac0227
--- /dev/null
+++ b/helpcontent2/source/auxiliary/mr/smath.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Math
+
+Language=mr
+Order=6
+Start=text%2Fsmath%2Fmain0000.xhp
+Heading=headingheading
+Program=MATH
diff --git a/helpcontent2/source/auxiliary/mr/swriter.cfg b/helpcontent2/source/auxiliary/mr/swriter.cfg
new file mode 100644
index 0000000000..db482f9efa
--- /dev/null
+++ b/helpcontent2/source/auxiliary/mr/swriter.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Writer
+
+Language=mr
+Order=2
+Start=text%2Fswriter%2Fmain0000.xhp
+Heading=headingheading
+Program=WRITER
diff --git a/helpcontent2/source/auxiliary/my/default.css b/helpcontent2/source/auxiliary/my/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/my/default.css
+++ b/helpcontent2/source/auxiliary/my/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/my/highcontrast1.css b/helpcontent2/source/auxiliary/my/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/my/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/my/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/my/highcontrast2.css b/helpcontent2/source/auxiliary/my/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/my/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/my/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/my/highcontrastblack.css b/helpcontent2/source/auxiliary/my/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/my/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/my/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/my/highcontrastwhite.css b/helpcontent2/source/auxiliary/my/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/my/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/my/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/my/sbasic.cfg b/helpcontent2/source/auxiliary/my/sbasic.cfg
index a78e0838ab..bcee1bf261 100755..100644
--- a/helpcontent2/source/auxiliary/my/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/my/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/my/scalc.cfg b/helpcontent2/source/auxiliary/my/scalc.cfg
index 35370d5c57..ca25009095 100755..100644
--- a/helpcontent2/source/auxiliary/my/scalc.cfg
+++ b/helpcontent2/source/auxiliary/my/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/my/schart.cfg b/helpcontent2/source/auxiliary/my/schart.cfg
index 68fa2544c2..309362f574 100755..100644
--- a/helpcontent2/source/auxiliary/my/schart.cfg
+++ b/helpcontent2/source/auxiliary/my/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/my/sdatabase.cfg b/helpcontent2/source/auxiliary/my/sdatabase.cfg
index 6fe1d6655e..bf4fd0c2b3 100644
--- a/helpcontent2/source/auxiliary/my/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/my/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/my/sdraw.cfg b/helpcontent2/source/auxiliary/my/sdraw.cfg
index 9df4effb77..6c853a2f3e 100755..100644
--- a/helpcontent2/source/auxiliary/my/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/my/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/my/simpress.cfg b/helpcontent2/source/auxiliary/my/simpress.cfg
index 1d3ca1cfd8..97a77be82a 100755..100644
--- a/helpcontent2/source/auxiliary/my/simpress.cfg
+++ b/helpcontent2/source/auxiliary/my/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/my/smath.cfg b/helpcontent2/source/auxiliary/my/smath.cfg
index cf42dd1af3..abbe42156c 100755..100644
--- a/helpcontent2/source/auxiliary/my/smath.cfg
+++ b/helpcontent2/source/auxiliary/my/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/my/swriter.cfg b/helpcontent2/source/auxiliary/my/swriter.cfg
index 4e93871f50..64b24cb339 100755..100644
--- a/helpcontent2/source/auxiliary/my/swriter.cfg
+++ b/helpcontent2/source/auxiliary/my/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nb/default.css b/helpcontent2/source/auxiliary/nb/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/nb/default.css
+++ b/helpcontent2/source/auxiliary/nb/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/nb/highcontrast1.css b/helpcontent2/source/auxiliary/nb/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/nb/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/nb/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/nb/highcontrast2.css b/helpcontent2/source/auxiliary/nb/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/nb/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/nb/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/nb/highcontrastblack.css b/helpcontent2/source/auxiliary/nb/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/nb/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/nb/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/nb/highcontrastwhite.css b/helpcontent2/source/auxiliary/nb/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/nb/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/nb/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/nb/sbasic.cfg b/helpcontent2/source/auxiliary/nb/sbasic.cfg
index 15723ad31a..bfa946810a 100755..100644
--- a/helpcontent2/source/auxiliary/nb/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/nb/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nb/scalc.cfg b/helpcontent2/source/auxiliary/nb/scalc.cfg
index 1e479ceb34..97fddc21f7 100755..100644
--- a/helpcontent2/source/auxiliary/nb/scalc.cfg
+++ b/helpcontent2/source/auxiliary/nb/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nb/schart.cfg b/helpcontent2/source/auxiliary/nb/schart.cfg
index 191d3b8d87..ded2377b4c 100755..100644
--- a/helpcontent2/source/auxiliary/nb/schart.cfg
+++ b/helpcontent2/source/auxiliary/nb/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/nb/sdatabase.cfg b/helpcontent2/source/auxiliary/nb/sdatabase.cfg
index 3ba686c920..1a1a9a6b5a 100644
--- a/helpcontent2/source/auxiliary/nb/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/nb/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nb/sdraw.cfg b/helpcontent2/source/auxiliary/nb/sdraw.cfg
index e5aab8abc1..acd26378c6 100755..100644
--- a/helpcontent2/source/auxiliary/nb/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/nb/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nb/simpress.cfg b/helpcontent2/source/auxiliary/nb/simpress.cfg
index 0e07d9918c..19c624168c 100755..100644
--- a/helpcontent2/source/auxiliary/nb/simpress.cfg
+++ b/helpcontent2/source/auxiliary/nb/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nb/smath.cfg b/helpcontent2/source/auxiliary/nb/smath.cfg
index 51e6f87868..e2f58119bc 100755..100644
--- a/helpcontent2/source/auxiliary/nb/smath.cfg
+++ b/helpcontent2/source/auxiliary/nb/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nb/swriter.cfg b/helpcontent2/source/auxiliary/nb/swriter.cfg
index 3a95eb334b..62bca944b4 100755..100644
--- a/helpcontent2/source/auxiliary/nb/swriter.cfg
+++ b/helpcontent2/source/auxiliary/nb/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ne/default.css b/helpcontent2/source/auxiliary/ne/default.css
index 8c00a0bba7..d36259b76c 100755..100644
--- a/helpcontent2/source/auxiliary/ne/default.css
+++ b/helpcontent2/source/auxiliary/ne/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Lohit Nepali",Kalimati,"Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Lohit Nepali",Kalimati,"Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Lohit Nepali",Kalimati,"Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Lohit Nepali",Kalimati,"Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/ne/highcontrast1.css b/helpcontent2/source/auxiliary/ne/highcontrast1.css
index 773d314fad..813da00ff3 100755..100644
--- a/helpcontent2/source/auxiliary/ne/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/ne/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Lohit Nepali",Kalimati,"Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Lohit Nepali",Kalimati,"Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Lohit Nepali",Kalimati,"Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Lohit Nepali",Kalimati,"Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ne/highcontrast2.css b/helpcontent2/source/auxiliary/ne/highcontrast2.css
index 99a3e31be7..a4d7db5913 100755..100644
--- a/helpcontent2/source/auxiliary/ne/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/ne/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Lohit Nepali",Kalimati,"Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Lohit Nepali",Kalimati,"Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Lohit Nepali",Kalimati,"Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Lohit Nepali",Kalimati,"Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ne/highcontrastblack.css b/helpcontent2/source/auxiliary/ne/highcontrastblack.css
index 0dbb55c045..f325921e6d 100755..100644
--- a/helpcontent2/source/auxiliary/ne/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/ne/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Lohit Nepali",Kalimati,"Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Lohit Nepali",Kalimati,"Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Lohit Nepali",Kalimati,"Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Lohit Nepali",Kalimati,"Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ne/highcontrastwhite.css b/helpcontent2/source/auxiliary/ne/highcontrastwhite.css
index dc28ffe595..e0f05e83ae 100755..100644
--- a/helpcontent2/source/auxiliary/ne/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/ne/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Lohit Nepali",Kalimati,"Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Lohit Nepali",Kalimati,"Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Lohit Nepali",Kalimati,"Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Lohit Nepali",Kalimati,"Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ne/sbasic.cfg b/helpcontent2/source/auxiliary/ne/sbasic.cfg
index cf2038528c..d044a2ecac 100755..100644
--- a/helpcontent2/source/auxiliary/ne/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/ne/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ne/scalc.cfg b/helpcontent2/source/auxiliary/ne/scalc.cfg
index 0dedd0a84a..bfea2e98a5 100755..100644
--- a/helpcontent2/source/auxiliary/ne/scalc.cfg
+++ b/helpcontent2/source/auxiliary/ne/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ne/schart.cfg b/helpcontent2/source/auxiliary/ne/schart.cfg
index 525cff5c2c..9bfab011ec 100755..100644
--- a/helpcontent2/source/auxiliary/ne/schart.cfg
+++ b/helpcontent2/source/auxiliary/ne/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/ne/sdatabase.cfg b/helpcontent2/source/auxiliary/ne/sdatabase.cfg
index 10596d2c2e..0e48588529 100644
--- a/helpcontent2/source/auxiliary/ne/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/ne/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ne/sdraw.cfg b/helpcontent2/source/auxiliary/ne/sdraw.cfg
index f2f6ac6d54..23991aa720 100755..100644
--- a/helpcontent2/source/auxiliary/ne/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/ne/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ne/simpress.cfg b/helpcontent2/source/auxiliary/ne/simpress.cfg
index 9c486f6109..6694114139 100755..100644
--- a/helpcontent2/source/auxiliary/ne/simpress.cfg
+++ b/helpcontent2/source/auxiliary/ne/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ne/smath.cfg b/helpcontent2/source/auxiliary/ne/smath.cfg
index 51f399b705..9fe01c6047 100755..100644
--- a/helpcontent2/source/auxiliary/ne/smath.cfg
+++ b/helpcontent2/source/auxiliary/ne/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ne/swriter.cfg b/helpcontent2/source/auxiliary/ne/swriter.cfg
index b90615d5a6..0942eac49a 100755..100644
--- a/helpcontent2/source/auxiliary/ne/swriter.cfg
+++ b/helpcontent2/source/auxiliary/ne/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nl/default.css b/helpcontent2/source/auxiliary/nl/default.css
index 2fa534688a..bcdc5f4e61 100644
--- a/helpcontent2/source/auxiliary/nl/default.css
+++ b/helpcontent2/source/auxiliary/nl/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/nl/highcontrast1.css b/helpcontent2/source/auxiliary/nl/highcontrast1.css
index b807a5895f..a3dd8e5db0 100644
--- a/helpcontent2/source/auxiliary/nl/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/nl/highcontrast1.css
@@ -13,111 +13,109 @@
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 */
 
-
 /* Main Styles */
 body                       { background: #000000; }
-p                          { 
-                             font-family: Albany,Helvetica,Verdana,Tahoma,Andale Sans,Arial,lucidux sans;
-                             font-size: 9pt; 
+p                          {
+                             font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Verdana,Tahoma,Andale Sans,lucidux sans;
+                             font-size: 9pt;
                              color: #FFFF00;
                            }
-td                         { 
+td                         {
                              color: #FFFF00;
-                             margin-left: 0pt; 
+                             margin-left: 0pt;
                            }
-th                         { color:#FFFF00; 
-                             align: left; 
-                             margin-left: 0pt; 
+th                         { color:#FFFF00;
+                             align: left;
+                             margin-left: 0pt;
                              font-weight:bold;
                            }
 
 /* Link styles */
 
-.ContentLink               { 
-                             color:#FFFF00; 
-                             font-weight: bold; 
-                             font-decoration: none; 
+.ContentLink               {
+                             color:#FFFF00;
+                             font-weight: bold;
+                             font-decoration: none;
                            }
 .ContentLink:hover         { font-decoration: underline; }
 
 /* Style classes simple paragraphs */
 
-.Paragraph                 { 
-                             margin-left: 0pt;  
-                             margin-top: 7pt; 
+.Paragraph                 {
+                             margin-left: 0pt;
+                             margin-top: 7pt;
                              margin-bottom: 7pt;
                            }
-.ParaList                  { 
-                             margin-left: 20pt; 
-                             margin-top: 2pt; 
-                             margin-bottom: 2pt; 
+.ParaList                  {
+                             margin-left: 20pt;
+                             margin-top: 2pt;
+                             margin-bottom: 2pt;
                            }
-.PropText                  { 
-                             font-family: Cumberland,Courier New,Courier; 
-                             margin-top: 2pt; 
-                             margin-bottom: 2pt; 
+.PropText                  {
+                             font-family: "Cumberland AMT",Cumberland,Courier New,Courier;
+                             margin-top: 2pt;
+                             margin-bottom: 2pt;
                            }
 
 /* Style classes headings */
 
-
-h1, .Head1                 { 
-                             font-family: Arial,Helvetica,Albany,lucidux sans; 
-                             color:#FFFF00; 
-                             font-size:18pt; 
-                             font-weight: bold; 
-                             margin-top: 5pt; 
-                           }
-h2, .Head2                 { 
-                             font-family: Arial,Helvetica,Albany,lucidux sans; 
-                             color:#FFFF00; 
-                             font-size:14pt; 
-                             font-weight: bold; 
-                             margin-top: 20pt; 
+h1, .Head1                 {
+                             font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,lucidux sans;
+                             color:#FFFF00;
+                             font-size:18pt;
+                             font-weight: bold;
+                             margin-top: 5pt;
+                           }
+h2, .Head2                 {
+                             font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,lucidux sans;
+                             color:#FFFF00;
+                             font-size:14pt;
+                             font-weight: bold;
+                             margin-top: 20pt;
                              margin-bottom: 2pt;
                            }
-h3, .Head3                 { 
-                             font-family: Arial,Helvetica,Albany,lucidux sans; 
-                             color:#FFFF00; 
-                             font-size:12pt; 
-                             font-weight:bold; 
-                             margin-top: 25pt; 
+h3, .Head3                 {
+                             font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,lucidux sans;
+                             color:#FFFF00;
+                             font-size:12pt;
+                             font-weight:bold;
+                             margin-top: 25pt;
                              margin-bottom: 2pt;
-                           } 
-h4, .Head4                 { 
-                             font-family: Arial,Helvetica,Albany,lucidux sans; 
-                             color:#FFFF00; 
-                             font-size:10pt; 
-                             font-weight:bold; 
-                             margin-top: 20pt; 
+                           }
+h4, .Head4                 {
+                             font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,lucidux sans;
+                             color:#FFFF00;
+                             font-size:10pt;
+                             font-weight:bold;
+                             margin-top: 20pt;
                              margin-bottom: 2pt;
                            }
-h5, .Head5                 { 
-                             font-family: Arial,Helvetica,Albany,lucidux sans; 
-                             color:#FFFF00; 
-                             font-size:10pt; 
-                             margin-top: 15pt; 
+h5, .Head5                 {
+                             font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,lucidux sans;
+                             color:#FFFF00;
+                             font-size:10pt;
+                             margin-top: 15pt;
                              margin-bottom: 2pt;
                            }
-h6, .Head6                 { 
-                             font-family: Arial,Helvetica,Albany,lucidux sans; 
-                             color:#FFFF00; 
-                             font-size:10pt; 
-                             margin-top: 15pt; 
+h6, .Head6                 {
+                             font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,lucidux sans;
+                             color:#FFFF00;
+                             font-size:10pt;
+                             margin-top: 15pt;
                              margin-bottom: 2pt;
                            }
 
 /* Style classes tables */
 
-.TextInTable               { 
-                             color:#FFFF00; 
-                             align: left; 
-                             margin-left: 0pt; 
+.TextInTable               {
+                             color:#FFFF00;
+                             align: left;
+                             margin-left: 0pt;
                            }
-.TableHead                 { 
-                             color:#FFFF00; 
-                             align: left; 
-                             font-weight:bold; 
+.TableHead                 {
+                             color:#FFFF00;
+                             align: left;
+                             font-weight:bold;
                            }
 
 /* Style classes spans */
@@ -132,31 +130,31 @@ h6, .Head6                 {
 .doctitlebg                { background: #000000; }
 .doctablebg                { background: #000000; }
 
-.howtogetheader            { 
-                             font-weight: bold; 
-                             color: #FFFF00; 
-                             background: #000000; 
+.howtogetheader            {
+                             font-weight: bold;
+                             color: #FFFF00;
+                             background: #000000;
                            }
-.howtogetbody              { 
-                             font-size: 9pt; 
-                             color: #FFFF00; 
-                             background: #000000; 
+.howtogetbody              {
+                             font-size: 9pt;
+                             color: #FFFF00;
+                             background: #000000;
                            }
-.howtogetpara              { 
-                             font-size: 9pt; 
-                             color: #FFFF00; 
-                             margin-top: 2pt; 
+.howtogetpara              {
+                             font-size: 9pt;
+                             color: #FFFF00;
+                             margin-top: 2pt;
                              margin-bottom: 2pt;
                            }
-.reltop                    { 
-                             background: #000000; 
-                             color:#FFFF00; 
-                             font-size:10pt; 
-                             font-weight:bold; 
-                             margin-top: 20pt; 
+.reltop                    {
+                             background: #000000;
+                             color:#FFFF00;
+                             font-size:10pt;
+                             font-weight:bold;
+                             margin-top: 20pt;
                              margin-bottom: 2pt;
                            }
 
 /* Style classes Webtop context */
 
-.ContentCell               { background: #000000; }
\ No newline at end of file
+.ContentCell               { background: #000000; }
diff --git a/helpcontent2/source/auxiliary/nl/highcontrast2.css b/helpcontent2/source/auxiliary/nl/highcontrast2.css
index ed404b76d9..7ac6db7416 100644
--- a/helpcontent2/source/auxiliary/nl/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/nl/highcontrast2.css
@@ -13,111 +13,109 @@
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 */
 
-
 /* Main Styles */
 body                       { background: #000000; }
-p                          { 
-                             font-family: Albany,Helvetica,Verdana,Tahoma,Andale Sans,Arial,lucidux sans;
-                             font-size: 9pt; 
+p                          {
+                             font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Verdana,Tahoma,Andale Sans,lucidux sans;
+                             font-size: 9pt;
                              color: #00FF00;
                            }
-td                         { 
+td                         {
                              color: #00FF00;
-                             margin-left: 0pt; 
+                             margin-left: 0pt;
                            }
-th                         { color:#00FF00; 
-                             align: left; 
-                             margin-left: 0pt; 
+th                         { color:#00FF00;
+                             align: left;
+                             margin-left: 0pt;
                              font-weight:bold;
                            }
 
 /* Link styles */
 
-.ContentLink               { 
-                             color:#00FF00; 
-                             font-weight: bold; 
-                             font-decoration: none; 
+.ContentLink               {
+                             color:#00FF00;
+                             font-weight: bold;
+                             font-decoration: none;
                            }
 .ContentLink:hover         { font-decoration: underline; }
 
 /* Style classes simple paragraphs */
 
-.Paragraph                 { 
-                             margin-left: 0pt;  
-                             margin-top: 7pt; 
+.Paragraph                 {
+                             margin-left: 0pt;
+                             margin-top: 7pt;
                              margin-bottom: 7pt;
                            }
-.ParaList                  { 
-                             margin-left: 20pt; 
-                             margin-top: 2pt; 
-                             margin-bottom: 2pt; 
+.ParaList                  {
+                             margin-left: 20pt;
+                             margin-top: 2pt;
+                             margin-bottom: 2pt;
                            }
-.PropText                  { 
-                             font-family: Cumberland,Courier New,Courier; 
-                             margin-top: 2pt; 
-                             margin-bottom: 2pt; 
+.PropText                  {
+                             font-family: "Cumberland AMT",Cumberland,Courier New,Courier;
+                             margin-top: 2pt;
+                             margin-bottom: 2pt;
                            }
 
 /* Style classes headings */
 
-
-h1, .Head1                 { 
-                             font-family: Arial,Helvetica,Albany,lucidux sans; 
-                             color:#00FF00; 
-                             font-size:18pt; 
-                             font-weight: bold; 
-                             margin-top: 5pt; 
-                           }
-h2, .Head2                 { 
-                             font-family: Arial,Helvetica,Albany,lucidux sans; 
-                             color:#00FF00; 
-                             font-size:14pt; 
-                             font-weight: bold; 
-                             margin-top: 20pt; 
+h1, .Head1                 {
+                             font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,lucidux sans;
+                             color:#00FF00;
+                             font-size:18pt;
+                             font-weight: bold;
+                             margin-top: 5pt;
+                           }
+h2, .Head2                 {
+                             font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,lucidux sans;
+                             color:#00FF00;
+                             font-size:14pt;
+                             font-weight: bold;
+                             margin-top: 20pt;
                              margin-bottom: 2pt;
                            }
-h3, .Head3                 { 
-                             font-family: Arial,Helvetica,Albany,lucidux sans; 
-                             color:#00FF00; 
-                             font-size:12pt; 
-                             font-weight:bold; 
-                             margin-top: 25pt; 
+h3, .Head3                 {
+                             font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,lucidux sans;
+                             color:#00FF00;
+                             font-size:12pt;
+                             font-weight:bold;
+                             margin-top: 25pt;
                              margin-bottom: 2pt;
-                           } 
-h4, .Head4                 { 
-                             font-family: Arial,Helvetica,Albany,lucidux sans; 
-                             color:#00FF00; 
-                             font-size:10pt; 
-                             font-weight:bold; 
-                             margin-top: 20pt; 
+                           }
+h4, .Head4                 {
+                             font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,lucidux sans;
+                             color:#00FF00;
+                             font-size:10pt;
+                             font-weight:bold;
+                             margin-top: 20pt;
                              margin-bottom: 2pt;
                            }
-h5, .Head5                 { 
-                             font-family: Arial,Helvetica,Albany,lucidux sans; 
-                             color:#00FF00; 
-                             font-size:10pt; 
-                             margin-top: 15pt; 
+h5, .Head5                 {
+                             font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,lucidux sans;
+                             color:#00FF00;
+                             font-size:10pt;
+                             margin-top: 15pt;
                              margin-bottom: 2pt;
                            }
-h6, .Head6                 { 
-                             font-family: Arial,Helvetica,Albany,lucidux sans; 
-                             color:#00FF00; 
-                             font-size:10pt; 
-                             margin-top: 15pt; 
+h6, .Head6                 {
+                             font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,lucidux sans;
+                             color:#00FF00;
+                             font-size:10pt;
+                             margin-top: 15pt;
                              margin-bottom: 2pt;
                            }
 
 /* Style classes tables */
 
-.TextInTable               { 
-                             color:#00FF00; 
-                             align: left; 
-                             margin-left: 0pt; 
+.TextInTable               {
+                             color:#00FF00;
+                             align: left;
+                             margin-left: 0pt;
                            }
-.TableHead                 { 
-                             color:#00FF00; 
-                             align: left; 
-                             font-weight:bold; 
+.TableHead                 {
+                             color:#00FF00;
+                             align: left;
+                             font-weight:bold;
                            }
 
 /* Style classes spans */
@@ -132,31 +130,31 @@ h6, .Head6                 {
 .doctitlebg                { background: #000000; }
 .doctablebg                { background: #000000; }
 
-.howtogetheader            { 
-                             font-weight: bold; 
-                             color: #00FF00; 
-                             background: #000000; 
+.howtogetheader            {
+                             font-weight: bold;
+                             color: #00FF00;
+                             background: #000000;
                            }
-.howtogetbody              { 
-                             font-size: 9pt; 
-                             color: #00FF00; 
-                             background: #000000; 
+.howtogetbody              {
+                             font-size: 9pt;
+                             color: #00FF00;
+                             background: #000000;
                            }
-.howtogetpara              { 
-                             font-size: 9pt; 
-                             color: #00FF00; 
-                             margin-top: 2pt; 
+.howtogetpara              {
+                             font-size: 9pt;
+                             color: #00FF00;
+                             margin-top: 2pt;
                              margin-bottom: 2pt;
                            }
-.reltop                    { 
-                             background: #000000; 
-                             color:#00FF00; 
-                             font-size:10pt; 
-                             font-weight:bold; 
-                             margin-top: 20pt; 
+.reltop                    {
+                             background: #000000;
+                             color:#00FF00;
+                             font-size:10pt;
+                             font-weight:bold;
+                             margin-top: 20pt;
                              margin-bottom: 2pt;
                            }
 
 /* Style classes Webtop context */
 
-.ContentCell               { background: #000000; }
\ No newline at end of file
+.ContentCell               { background: #000000; }
diff --git a/helpcontent2/source/auxiliary/nl/highcontrastblack.css b/helpcontent2/source/auxiliary/nl/highcontrastblack.css
index b57ea899c6..d0a8725078 100644
--- a/helpcontent2/source/auxiliary/nl/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/nl/highcontrastblack.css
@@ -13,111 +13,109 @@
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 */
 
-
 /* Main Styles */
 body                       { background: #000000; }
-p                          { 
-                             font-family: Albany,Helvetica,Verdana,Tahoma,Andale Sans,Arial,lucidux sans;
-                             font-size: 9pt; 
+p                          {
+                             font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Verdana,Tahoma,Andale Sans,lucidux sans;
+                             font-size: 9pt;
                              color: #FFFFFF;
                            }
-td                         { 
+td                         {
                              color: #FFFFFF;
-                             margin-left: 0pt; 
+                             margin-left: 0pt;
                            }
-th                         { color:#FFFFFF; 
-                             align: left; 
-                             margin-left: 0pt; 
+th                         { color:#FFFFFF;
+                             align: left;
+                             margin-left: 0pt;
                              font-weight:bold;
                            }
 
 /* Link styles */
 
-.ContentLink               { 
-                             color:#FFFFFF; 
-                             font-weight: bold; 
-                             font-decoration: none; 
+.ContentLink               {
+                             color:#FFFFFF;
+                             font-weight: bold;
+                             font-decoration: none;
                            }
 .ContentLink:hover         { font-decoration: underline; }
 
 /* Style classes simple paragraphs */
 
-.Paragraph                 { 
-                             margin-left: 0pt;  
-                             margin-top: 7pt; 
+.Paragraph                 {
+                             margin-left: 0pt;
+                             margin-top: 7pt;
                              margin-bottom: 7pt;
                            }
-.ParaList                  { 
-                             margin-left: 20pt; 
-                             margin-top: 2pt; 
-                             margin-bottom: 2pt; 
+.ParaList                  {
+                             margin-left: 20pt;
+                             margin-top: 2pt;
+                             margin-bottom: 2pt;
                            }
-.PropText                  { 
-                             font-family: Cumberland,Courier New,Courier; 
-                             margin-top: 2pt; 
-                             margin-bottom: 2pt; 
+.PropText                  {
+                             font-family: "Cumberland AMT",Cumberland,Courier New,Courier;
+                             margin-top: 2pt;
+                             margin-bottom: 2pt;
                            }
 
 /* Style classes headings */
 
-
-h1, .Head1                 { 
-                             font-family: Arial,Helvetica,Albany,lucidux sans; 
-                             color:#FFFFFF; 
-                             font-size:18pt; 
-                             font-weight: bold; 
-                             margin-top: 5pt; 
-                           }
-h2, .Head2                 { 
-                             font-family: Arial,Helvetica,Albany,lucidux sans; 
-                             color:#FFFFFF; 
-                             font-size:14pt; 
-                             font-weight: bold; 
-                             margin-top: 20pt; 
+h1, .Head1                 {
+                             font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,lucidux sans;
+                             color:#FFFFFF;
+                             font-size:18pt;
+                             font-weight: bold;
+                             margin-top: 5pt;
+                           }
+h2, .Head2                 {
+                             font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,lucidux sans;
+                             color:#FFFFFF;
+                             font-size:14pt;
+                             font-weight: bold;
+                             margin-top: 20pt;
                              margin-bottom: 2pt;
                            }
-h3, .Head3                 { 
-                             font-family: Arial,Helvetica,Albany,lucidux sans; 
-                             color:#FFFFFF; 
-                             font-size:12pt; 
-                             font-weight:bold; 
-                             margin-top: 25pt; 
+h3, .Head3                 {
+                             font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,lucidux sans;
+                             color:#FFFFFF;
+                             font-size:12pt;
+                             font-weight:bold;
+                             margin-top: 25pt;
                              margin-bottom: 2pt;
-                           } 
-h4, .Head4                 { 
-                             font-family: Arial,Helvetica,Albany,lucidux sans; 
-                             color:#FFFFFF; 
-                             font-size:10pt; 
-                             font-weight:bold; 
-                             margin-top: 20pt; 
+                           }
+h4, .Head4                 {
+                             font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,lucidux sans;
+                             color:#FFFFFF;
+                             font-size:10pt;
+                             font-weight:bold;
+                             margin-top: 20pt;
                              margin-bottom: 2pt;
                            }
-h5, .Head5                 { 
-                             font-family: Arial,Helvetica,Albany,lucidux sans; 
-                             color:#FFFFFF; 
-                             font-size:10pt; 
-                             margin-top: 15pt; 
+h5, .Head5                 {
+                             font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,lucidux sans;
+                             color:#FFFFFF;
+                             font-size:10pt;
+                             margin-top: 15pt;
                              margin-bottom: 2pt;
                            }
-h6, .Head6                 { 
-                             font-family: Arial,Helvetica,Albany,lucidux sans; 
-                             color:#FFFFFF; 
-                             font-size:10pt; 
-                             margin-top: 15pt; 
+h6, .Head6                 {
+                             font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,lucidux sans;
+                             color:#FFFFFF;
+                             font-size:10pt;
+                             margin-top: 15pt;
                              margin-bottom: 2pt;
                            }
 
 /* Style classes tables */
 
-.TextInTable               { 
-                             color:#FFFFFF; 
-                             align: left; 
-                             margin-left: 0pt; 
+.TextInTable               {
+                             color:#FFFFFF;
+                             align: left;
+                             margin-left: 0pt;
                            }
-.TableHead                 { 
-                             color:#FFFFFF; 
-                             align: left; 
-                             font-weight:bold; 
+.TableHead                 {
+                             color:#FFFFFF;
+                             align: left;
+                             font-weight:bold;
                            }
 
 /* Style classes spans */
@@ -132,31 +130,31 @@ h6, .Head6                 {
 .doctitlebg                { background: #000000; }
 .doctablebg                { background: #000000; }
 
-.howtogetheader            { 
-                             font-weight: bold; 
-                             color: #FFFFFF; 
-                             background: #000000; 
+.howtogetheader            {
+                             font-weight: bold;
+                             color: #FFFFFF;
+                             background: #000000;
                            }
-.howtogetbody              { 
-                             font-size: 9pt; 
-                             color: #FFFFFF; 
-                             background: #000000; 
+.howtogetbody              {
+                             font-size: 9pt;
+                             color: #FFFFFF;
+                             background: #000000;
                            }
-.howtogetpara              { 
-                             font-size: 9pt; 
-                             color: #FFFFFF; 
-                             margin-top: 2pt; 
+.howtogetpara              {
+                             font-size: 9pt;
+                             color: #FFFFFF;
+                             margin-top: 2pt;
                              margin-bottom: 2pt;
                            }
-.reltop                    { 
-                             background: #000000; 
-                             color:#FFFFFF; 
-                             font-size:10pt; 
-                             font-weight:bold; 
-                             margin-top: 20pt; 
+.reltop                    {
+                             background: #000000;
+                             color:#FFFFFF;
+                             font-size:10pt;
+                             font-weight:bold;
+                             margin-top: 20pt;
                              margin-bottom: 2pt;
                            }
 
 /* Style classes Webtop context */
 
-.ContentCell               { background: #000000; }
\ No newline at end of file
+.ContentCell               { background: #000000; }
diff --git a/helpcontent2/source/auxiliary/nl/highcontrastwhite.css b/helpcontent2/source/auxiliary/nl/highcontrastwhite.css
index 43a6fce82d..74e698625f 100644
--- a/helpcontent2/source/auxiliary/nl/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/nl/highcontrastwhite.css
@@ -13,111 +13,109 @@
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 */
 
-
 /* Main Styles */
 body                       { background: #FFFFFF; }
-p                          { 
-                             font-family: Albany,Helvetica,Verdana,Tahoma,Andale Sans,Arial,lucidux sans;
-                             font-size: 9pt; 
+p                          {
+                             font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Verdana,Tahoma,Andale Sans,lucidux sans;
+                             font-size: 9pt;
                              color: #000000;
                            }
-td                         { 
+td                         {
                              color: #000000;
-                             margin-left: 0pt; 
+                             margin-left: 0pt;
                            }
-th                         { color:#000000; 
-                             align: left; 
-                             margin-left: 0pt; 
+th                         { color:#000000;
+                             align: left;
+                             margin-left: 0pt;
                              font-weight:bold;
                            }
 
 /* Link styles */
 
-.ContentLink               { 
-                             color:#000000; 
-                             font-weight: bold; 
-                             font-decoration: none; 
+.ContentLink               {
+                             color:#000000;
+                             font-weight: bold;
+                             font-decoration: none;
                            }
 .ContentLink:hover         { font-decoration: underline; }
 
 /* Style classes simple paragraphs */
 
-.Paragraph                 { 
-                             margin-left: 0pt;  
-                             margin-top: 7pt; 
+.Paragraph                 {
+                             margin-left: 0pt;
+                             margin-top: 7pt;
                              margin-bottom: 7pt;
                            }
-.ParaList                  { 
-                             margin-left: 20pt; 
-                             margin-top: 2pt; 
-                             margin-bottom: 2pt; 
+.ParaList                  {
+                             margin-left: 20pt;
+                             margin-top: 2pt;
+                             margin-bottom: 2pt;
                            }
-.PropText                  { 
-                             font-family: Cumberland,Courier New,Courier; 
-                             margin-top: 2pt; 
-                             margin-bottom: 2pt; 
+.PropText                  {
+                             font-family: "Cumberland AMT",Cumberland,Courier New,Courier;
+                             margin-top: 2pt;
+                             margin-bottom: 2pt;
                            }
 
 /* Style classes headings */
 
-
-h1, .Head1                 { 
-                             font-family: Arial,Helvetica,Albany,lucidux sans; 
-                             color:#000000; 
-                             font-size:18pt; 
-                             font-weight: bold; 
-                             margin-top: 5pt; 
-                           }
-h2, .Head2                 { 
-                             font-family: Arial,Helvetica,Albany,lucidux sans; 
-                             color:#000000; 
-                             font-size:14pt; 
-                             font-weight: bold; 
-                             margin-top: 20pt; 
+h1, .Head1                 {
+                             font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,lucidux sans;
+                             color:#000000;
+                             font-size:18pt;
+                             font-weight: bold;
+                             margin-top: 5pt;
+                           }
+h2, .Head2                 {
+                             font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,lucidux sans;
+                             color:#000000;
+                             font-size:14pt;
+                             font-weight: bold;
+                             margin-top: 20pt;
                              margin-bottom: 2pt;
                            }
-h3, .Head3                 { 
-                             font-family: Arial,Helvetica,Albany,lucidux sans; 
-                             color:#000000; 
-                             font-size:12pt; 
-                             font-weight:bold; 
-                             margin-top: 25pt; 
+h3, .Head3                 {
+                             font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,lucidux sans;
+                             color:#000000;
+                             font-size:12pt;
+                             font-weight:bold;
+                             margin-top: 25pt;
                              margin-bottom: 2pt;
-                           } 
-h4, .Head4                 { 
-                             font-family: Arial,Helvetica,Albany,lucidux sans; 
-                             color:#000000; 
-                             font-size:10pt; 
-                             font-weight:bold; 
-                             margin-top: 20pt; 
+                           }
+h4, .Head4                 {
+                             font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,lucidux sans;
+                             color:#000000;
+                             font-size:10pt;
+                             font-weight:bold;
+                             margin-top: 20pt;
                              margin-bottom: 2pt;
                            }
-h5, .Head5                 { 
-                             font-family: Arial,Helvetica,Albany,lucidux sans; 
-                             color:#000000; 
-                             font-size:10pt; 
-                             margin-top: 15pt; 
+h5, .Head5                 {
+                             font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,lucidux sans;
+                             color:#000000;
+                             font-size:10pt;
+                             margin-top: 15pt;
                              margin-bottom: 2pt;
                            }
-h6, .Head6                 { 
-                             font-family: Arial,Helvetica,Albany,lucidux sans; 
-                             color:#000000; 
-                             font-size:10pt; 
-                             margin-top: 15pt; 
+h6, .Head6                 {
+                             font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,lucidux sans;
+                             color:#000000;
+                             font-size:10pt;
+                             margin-top: 15pt;
                              margin-bottom: 2pt;
                            }
 
 /* Style classes tables */
 
-.TextInTable               { 
-                             color:#000000; 
-                             align: left; 
-                             margin-left: 0pt; 
+.TextInTable               {
+                             color:#000000;
+                             align: left;
+                             margin-left: 0pt;
                            }
-.TableHead                 { 
-                             color:#000000; 
-                             align: left; 
-                             font-weight:bold; 
+.TableHead                 {
+                             color:#000000;
+                             align: left;
+                             font-weight:bold;
                            }
 
 /* Style classes spans */
@@ -132,31 +130,31 @@ h6, .Head6                 {
 .doctitlebg                { background: #FFFFFF; }
 .doctablebg                { background: #FFFFFF; }
 
-.howtogetheader            { 
-                             font-weight: bold; 
-                             color: #000000; 
-                             background: #FFFFFF; 
+.howtogetheader            {
+                             font-weight: bold;
+                             color: #000000;
+                             background: #FFFFFF;
                            }
-.howtogetbody              { 
-                             font-size: 9pt; 
-                             color: #000000; 
-                             background: #FFFFFF; 
+.howtogetbody              {
+                             font-size: 9pt;
+                             color: #000000;
+                             background: #FFFFFF;
                            }
-.howtogetpara              { 
-                             font-size: 9pt; 
-                             color: #000000; 
-                             margin-top: 2pt; 
+.howtogetpara              {
+                             font-size: 9pt;
+                             color: #000000;
+                             margin-top: 2pt;
                              margin-bottom: 2pt;
                            }
-.reltop                    { 
-                             background: #FFFFFF; 
-                             color:#000000; 
-                             font-size:10pt; 
-                             font-weight:bold; 
-                             margin-top: 20pt; 
+.reltop                    {
+                             background: #FFFFFF;
+                             color:#000000;
+                             font-size:10pt;
+                             font-weight:bold;
+                             margin-top: 20pt;
                              margin-bottom: 2pt;
                            }
 
 /* Style classes Webtop context */
 
-.ContentCell               { background: #FFFFFF; }
\ No newline at end of file
+.ContentCell               { background: #FFFFFF; }
diff --git a/helpcontent2/source/auxiliary/nl/sbasic.cfg b/helpcontent2/source/auxiliary/nl/sbasic.cfg
index 452ae27865..a6b4c20d9e 100644
--- a/helpcontent2/source/auxiliary/nl/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/nl/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nl/scalc.cfg b/helpcontent2/source/auxiliary/nl/scalc.cfg
index 85e5b7d475..4062cfa8f1 100644
--- a/helpcontent2/source/auxiliary/nl/scalc.cfg
+++ b/helpcontent2/source/auxiliary/nl/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nl/schart.cfg b/helpcontent2/source/auxiliary/nl/schart.cfg
index 080cad42b9..e8e4bed5e7 100755..100644
--- a/helpcontent2/source/auxiliary/nl/schart.cfg
+++ b/helpcontent2/source/auxiliary/nl/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/nl/sdatabase.cfg b/helpcontent2/source/auxiliary/nl/sdatabase.cfg
index bf7a2a72bc..d49cbdeda7 100644
--- a/helpcontent2/source/auxiliary/nl/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/nl/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nl/sdraw.cfg b/helpcontent2/source/auxiliary/nl/sdraw.cfg
index 36a26bf9c4..7f0e6ccda9 100644
--- a/helpcontent2/source/auxiliary/nl/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/nl/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nl/simpress.cfg b/helpcontent2/source/auxiliary/nl/simpress.cfg
index 0e1dcfde44..0c9fbe48b4 100644
--- a/helpcontent2/source/auxiliary/nl/simpress.cfg
+++ b/helpcontent2/source/auxiliary/nl/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nl/smath.cfg b/helpcontent2/source/auxiliary/nl/smath.cfg
index 5a1cdc617c..07ef72a186 100644
--- a/helpcontent2/source/auxiliary/nl/smath.cfg
+++ b/helpcontent2/source/auxiliary/nl/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nl/swriter.cfg b/helpcontent2/source/auxiliary/nl/swriter.cfg
index 8fd8a22a26..b38d018a43 100644
--- a/helpcontent2/source/auxiliary/nl/swriter.cfg
+++ b/helpcontent2/source/auxiliary/nl/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nn/default.css b/helpcontent2/source/auxiliary/nn/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/nn/default.css
+++ b/helpcontent2/source/auxiliary/nn/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/nn/highcontrast1.css b/helpcontent2/source/auxiliary/nn/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/nn/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/nn/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/nn/highcontrast2.css b/helpcontent2/source/auxiliary/nn/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/nn/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/nn/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/nn/highcontrastblack.css b/helpcontent2/source/auxiliary/nn/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/nn/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/nn/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/nn/highcontrastwhite.css b/helpcontent2/source/auxiliary/nn/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/nn/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/nn/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/nn/sbasic.cfg b/helpcontent2/source/auxiliary/nn/sbasic.cfg
index d085404a58..34a310bfa6 100755..100644
--- a/helpcontent2/source/auxiliary/nn/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/nn/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nn/scalc.cfg b/helpcontent2/source/auxiliary/nn/scalc.cfg
index 8a9ab5eeec..1f3627bbe9 100755..100644
--- a/helpcontent2/source/auxiliary/nn/scalc.cfg
+++ b/helpcontent2/source/auxiliary/nn/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nn/schart.cfg b/helpcontent2/source/auxiliary/nn/schart.cfg
index 46eba40d35..ea14d48fc6 100755..100644
--- a/helpcontent2/source/auxiliary/nn/schart.cfg
+++ b/helpcontent2/source/auxiliary/nn/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/nn/sdatabase.cfg b/helpcontent2/source/auxiliary/nn/sdatabase.cfg
index 2e1cd80504..a6cbbf8f43 100644
--- a/helpcontent2/source/auxiliary/nn/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/nn/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nn/sdraw.cfg b/helpcontent2/source/auxiliary/nn/sdraw.cfg
index b211c3a9c7..1c363448af 100755..100644
--- a/helpcontent2/source/auxiliary/nn/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/nn/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nn/simpress.cfg b/helpcontent2/source/auxiliary/nn/simpress.cfg
index 70b22e5fb3..ed874659da 100755..100644
--- a/helpcontent2/source/auxiliary/nn/simpress.cfg
+++ b/helpcontent2/source/auxiliary/nn/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nn/smath.cfg b/helpcontent2/source/auxiliary/nn/smath.cfg
index d68e63afa7..5e0732b6e7 100755..100644
--- a/helpcontent2/source/auxiliary/nn/smath.cfg
+++ b/helpcontent2/source/auxiliary/nn/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nn/swriter.cfg b/helpcontent2/source/auxiliary/nn/swriter.cfg
index 48c43b7295..fc9ef7f96d 100755..100644
--- a/helpcontent2/source/auxiliary/nn/swriter.cfg
+++ b/helpcontent2/source/auxiliary/nn/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nr/default.css b/helpcontent2/source/auxiliary/nr/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/nr/default.css
+++ b/helpcontent2/source/auxiliary/nr/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/nr/highcontrast1.css b/helpcontent2/source/auxiliary/nr/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/nr/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/nr/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/nr/highcontrast2.css b/helpcontent2/source/auxiliary/nr/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/nr/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/nr/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/nr/highcontrastblack.css b/helpcontent2/source/auxiliary/nr/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/nr/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/nr/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/nr/highcontrastwhite.css b/helpcontent2/source/auxiliary/nr/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/nr/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/nr/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/nr/sbasic.cfg b/helpcontent2/source/auxiliary/nr/sbasic.cfg
index da74ba00e7..f3d0cdcbbc 100755..100644
--- a/helpcontent2/source/auxiliary/nr/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/nr/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nr/scalc.cfg b/helpcontent2/source/auxiliary/nr/scalc.cfg
index 8244bc9d98..f356a29657 100755..100644
--- a/helpcontent2/source/auxiliary/nr/scalc.cfg
+++ b/helpcontent2/source/auxiliary/nr/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nr/schart.cfg b/helpcontent2/source/auxiliary/nr/schart.cfg
index 47513c1241..5484a4226f 100755..100644
--- a/helpcontent2/source/auxiliary/nr/schart.cfg
+++ b/helpcontent2/source/auxiliary/nr/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/nr/sdatabase.cfg b/helpcontent2/source/auxiliary/nr/sdatabase.cfg
index 6fa3a835e0..a37987c76e 100644
--- a/helpcontent2/source/auxiliary/nr/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/nr/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nr/sdraw.cfg b/helpcontent2/source/auxiliary/nr/sdraw.cfg
index 3bd928fa35..f9f47a030f 100755..100644
--- a/helpcontent2/source/auxiliary/nr/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/nr/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nr/simpress.cfg b/helpcontent2/source/auxiliary/nr/simpress.cfg
index cad4bbbd87..0bc12c0240 100755..100644
--- a/helpcontent2/source/auxiliary/nr/simpress.cfg
+++ b/helpcontent2/source/auxiliary/nr/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nr/smath.cfg b/helpcontent2/source/auxiliary/nr/smath.cfg
index cfb9a8c774..53e355e631 100755..100644
--- a/helpcontent2/source/auxiliary/nr/smath.cfg
+++ b/helpcontent2/source/auxiliary/nr/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nr/swriter.cfg b/helpcontent2/source/auxiliary/nr/swriter.cfg
index 5fde694e2e..c23d07275a 100755..100644
--- a/helpcontent2/source/auxiliary/nr/swriter.cfg
+++ b/helpcontent2/source/auxiliary/nr/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nso/default.css b/helpcontent2/source/auxiliary/nso/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/nso/default.css
+++ b/helpcontent2/source/auxiliary/nso/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/nso/highcontrast1.css b/helpcontent2/source/auxiliary/nso/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/nso/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/nso/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/nso/highcontrast2.css b/helpcontent2/source/auxiliary/nso/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/nso/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/nso/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/nso/highcontrastblack.css b/helpcontent2/source/auxiliary/nso/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/nso/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/nso/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/nso/highcontrastwhite.css b/helpcontent2/source/auxiliary/nso/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/nso/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/nso/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/nso/sbasic.cfg b/helpcontent2/source/auxiliary/nso/sbasic.cfg
index 9e9080a4a1..5a36f55e56 100755..100644
--- a/helpcontent2/source/auxiliary/nso/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/nso/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nso/scalc.cfg b/helpcontent2/source/auxiliary/nso/scalc.cfg
index 7bea8e5a9e..287ada8ec4 100755..100644
--- a/helpcontent2/source/auxiliary/nso/scalc.cfg
+++ b/helpcontent2/source/auxiliary/nso/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nso/schart.cfg b/helpcontent2/source/auxiliary/nso/schart.cfg
index 7d201389f2..efc609e42c 100755..100644
--- a/helpcontent2/source/auxiliary/nso/schart.cfg
+++ b/helpcontent2/source/auxiliary/nso/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/nso/sdatabase.cfg b/helpcontent2/source/auxiliary/nso/sdatabase.cfg
index 596788a302..c74d8e32a0 100644
--- a/helpcontent2/source/auxiliary/nso/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/nso/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nso/sdraw.cfg b/helpcontent2/source/auxiliary/nso/sdraw.cfg
index f5f434da44..a90a492bfa 100755..100644
--- a/helpcontent2/source/auxiliary/nso/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/nso/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nso/simpress.cfg b/helpcontent2/source/auxiliary/nso/simpress.cfg
index 1fe0347d26..eebc0fa876 100755..100644
--- a/helpcontent2/source/auxiliary/nso/simpress.cfg
+++ b/helpcontent2/source/auxiliary/nso/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nso/smath.cfg b/helpcontent2/source/auxiliary/nso/smath.cfg
index a0a2ec66d3..30716cacb4 100755..100644
--- a/helpcontent2/source/auxiliary/nso/smath.cfg
+++ b/helpcontent2/source/auxiliary/nso/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/nso/swriter.cfg b/helpcontent2/source/auxiliary/nso/swriter.cfg
index e461355e63..e5f3d78f96 100755..100644
--- a/helpcontent2/source/auxiliary/nso/swriter.cfg
+++ b/helpcontent2/source/auxiliary/nso/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/oc/default.css b/helpcontent2/source/auxiliary/oc/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/oc/default.css
+++ b/helpcontent2/source/auxiliary/oc/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/oc/highcontrast1.css b/helpcontent2/source/auxiliary/oc/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/oc/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/oc/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/oc/highcontrast2.css b/helpcontent2/source/auxiliary/oc/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/oc/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/oc/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/oc/highcontrastblack.css b/helpcontent2/source/auxiliary/oc/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/oc/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/oc/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/oc/highcontrastwhite.css b/helpcontent2/source/auxiliary/oc/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/oc/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/oc/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/oc/sbasic.cfg b/helpcontent2/source/auxiliary/oc/sbasic.cfg
index de8329923d..c2a6e1b9bd 100755..100644
--- a/helpcontent2/source/auxiliary/oc/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/oc/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/oc/scalc.cfg b/helpcontent2/source/auxiliary/oc/scalc.cfg
index da403a63a4..5f078abbc6 100755..100644
--- a/helpcontent2/source/auxiliary/oc/scalc.cfg
+++ b/helpcontent2/source/auxiliary/oc/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/oc/schart.cfg b/helpcontent2/source/auxiliary/oc/schart.cfg
index fa7c70fa2e..60bc574689 100755..100644
--- a/helpcontent2/source/auxiliary/oc/schart.cfg
+++ b/helpcontent2/source/auxiliary/oc/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/oc/sdatabase.cfg b/helpcontent2/source/auxiliary/oc/sdatabase.cfg
index 3419d6e826..3dcbf90074 100644
--- a/helpcontent2/source/auxiliary/oc/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/oc/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/oc/sdraw.cfg b/helpcontent2/source/auxiliary/oc/sdraw.cfg
index fd6e295698..03e260e222 100755..100644
--- a/helpcontent2/source/auxiliary/oc/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/oc/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/oc/simpress.cfg b/helpcontent2/source/auxiliary/oc/simpress.cfg
index e15d715cb2..62a66548d8 100755..100644
--- a/helpcontent2/source/auxiliary/oc/simpress.cfg
+++ b/helpcontent2/source/auxiliary/oc/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/oc/smath.cfg b/helpcontent2/source/auxiliary/oc/smath.cfg
index 07187dd034..b71d551c6b 100755..100644
--- a/helpcontent2/source/auxiliary/oc/smath.cfg
+++ b/helpcontent2/source/auxiliary/oc/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/oc/swriter.cfg b/helpcontent2/source/auxiliary/oc/swriter.cfg
index 7919abc981..89692bd184 100755..100644
--- a/helpcontent2/source/auxiliary/oc/swriter.cfg
+++ b/helpcontent2/source/auxiliary/oc/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/om/default.css b/helpcontent2/source/auxiliary/om/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/om/default.css
+++ b/helpcontent2/source/auxiliary/om/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/om/highcontrast1.css b/helpcontent2/source/auxiliary/om/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/om/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/om/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/om/highcontrast2.css b/helpcontent2/source/auxiliary/om/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/om/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/om/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/om/highcontrastblack.css b/helpcontent2/source/auxiliary/om/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/om/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/om/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/om/highcontrastwhite.css b/helpcontent2/source/auxiliary/om/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/om/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/om/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/om/sbasic.cfg b/helpcontent2/source/auxiliary/om/sbasic.cfg
index da5cac2f66..41b49fcfc4 100644
--- a/helpcontent2/source/auxiliary/om/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/om/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/om/scalc.cfg b/helpcontent2/source/auxiliary/om/scalc.cfg
index e98c6f6db6..14cb85519c 100644
--- a/helpcontent2/source/auxiliary/om/scalc.cfg
+++ b/helpcontent2/source/auxiliary/om/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/om/schart.cfg b/helpcontent2/source/auxiliary/om/schart.cfg
index ca4e57d35f..7b6c2ca2d5 100644
--- a/helpcontent2/source/auxiliary/om/schart.cfg
+++ b/helpcontent2/source/auxiliary/om/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/om/sdatabase.cfg b/helpcontent2/source/auxiliary/om/sdatabase.cfg
index 5347313441..5a7010278e 100644
--- a/helpcontent2/source/auxiliary/om/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/om/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/om/sdraw.cfg b/helpcontent2/source/auxiliary/om/sdraw.cfg
index 91a561692d..1fc04d9176 100644
--- a/helpcontent2/source/auxiliary/om/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/om/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/om/simpress.cfg b/helpcontent2/source/auxiliary/om/simpress.cfg
index 02a9c0d77b..c56424264b 100644
--- a/helpcontent2/source/auxiliary/om/simpress.cfg
+++ b/helpcontent2/source/auxiliary/om/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/om/smath.cfg b/helpcontent2/source/auxiliary/om/smath.cfg
index ba6ac6ac02..8e49e2bb2d 100644
--- a/helpcontent2/source/auxiliary/om/smath.cfg
+++ b/helpcontent2/source/auxiliary/om/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/om/swriter.cfg b/helpcontent2/source/auxiliary/om/swriter.cfg
index 9205b0eff1..2bb02d36f1 100644
--- a/helpcontent2/source/auxiliary/om/swriter.cfg
+++ b/helpcontent2/source/auxiliary/om/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/or/default.css b/helpcontent2/source/auxiliary/or/default.css
new file mode 100644
index 0000000000..bcdc5f4e61
--- /dev/null
+++ b/helpcontent2/source/auxiliary/or/default.css
@@ -0,0 +1,73 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                          DEFAULT STYLESHEET                       +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold; }
+
+.related
+	{ font-weight: bold; margin-top:20pt; border-top: 1px solid black;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; border: 1px solid #999999; background: #FFFFFF; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; margin-top: 2px; margin-bottom: 2px;}
+
+h1
+	{ font-size: 18pt; border-bottom: 1px solid black; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.howtoget
+	{ background:#EEEEEE;}
+
+.howtogetbody
+	{ background:#EEEEEE; margin: 0px;}
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+.debug
+	{ border: 1px solid black; padding: 3px; display: none;}
diff --git a/helpcontent2/source/auxiliary/or/highcontrast1.css b/helpcontent2/source/auxiliary/or/highcontrast1.css
new file mode 100644
index 0000000000..1b44518acd
--- /dev/null
+++ b/helpcontent2/source/auxiliary/or/highcontrast1.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #1 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFF00;}
+
+.related 
+	{ border-top: 1px solid #FFFF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/or/highcontrast2.css b/helpcontent2/source/auxiliary/or/highcontrast2.css
new file mode 100644
index 0000000000..6f934a4196
--- /dev/null
+++ b/helpcontent2/source/auxiliary/or/highcontrast2.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #2 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #00FF00;}
+
+.related 
+	{ border-top: 1px solid #00FF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #00FF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #00FF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/or/highcontrastblack.css b/helpcontent2/source/auxiliary/or/highcontrastblack.css
new file mode 100644
index 0000000000..87c4b7e310
--- /dev/null
+++ b/helpcontent2/source/auxiliary/or/highcontrastblack.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST BLACK STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFFFF;}
+
+.related 
+	{ border-top: 1px solid #FFFFFF; }
+
+.howtogetheader
+	{border: 1px solid #FFFFFF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFFFF; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFFFF; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/or/highcontrastwhite.css b/helpcontent2/source/auxiliary/or/highcontrastwhite.css
new file mode 100644
index 0000000000..9c8bbe469e
--- /dev/null
+++ b/helpcontent2/source/auxiliary/or/highcontrastwhite.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST WHITE STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #FFFFFF; color: #000000;}
+
+.related 
+	{ border-top: 1px solid #000000; }
+
+.howtogetheader
+	{border: 1px solid #000000; background: #FFFFFF;}
+
+h1 
+	{ border-bottom: 1px solid #000000; ]
+
+.howtoget
+	{ background:#FFFFFF;}
+
+.howtogetbody
+	{ background:#FFFFFF;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #000000; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/or/sbasic.cfg b/helpcontent2/source/auxiliary/or/sbasic.cfg
new file mode 100644
index 0000000000..0fd2617c8e
--- /dev/null
+++ b/helpcontent2/source/auxiliary/or/sbasic.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Basic
+
+Language=or
+Order=7
+Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
+Heading=headingheading
+Program=BASIC 
diff --git a/helpcontent2/source/auxiliary/or/scalc.cfg b/helpcontent2/source/auxiliary/or/scalc.cfg
new file mode 100644
index 0000000000..39d010aca8
--- /dev/null
+++ b/helpcontent2/source/auxiliary/or/scalc.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Calc
+
+Language=or
+Order=3
+Start=text%2Fscalc%2Fmain0000.xhp
+Heading=headingheading
+Program=CALC
diff --git a/helpcontent2/source/auxiliary/or/schart.cfg b/helpcontent2/source/auxiliary/or/schart.cfg
new file mode 100644
index 0000000000..53173e018b
--- /dev/null
+++ b/helpcontent2/source/auxiliary/or/schart.cfg
@@ -0,0 +1,8 @@
+Title=%PRODUCTNAME Chart
+
+Language=or
+Order=4
+Start=text%2Fschart%2Fmain0000.xhp
+Heading=headingheading
+Program=CHART
+
diff --git a/helpcontent2/source/auxiliary/or/sdatabase.cfg b/helpcontent2/source/auxiliary/or/sdatabase.cfg
new file mode 100644
index 0000000000..c1d2fe8b7e
--- /dev/null
+++ b/helpcontent2/source/auxiliary/or/sdatabase.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Base
+
+Language=or
+Order=7
+Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
+Heading=headingheading
+Program=DATABASE 
diff --git a/helpcontent2/source/auxiliary/or/sdraw.cfg b/helpcontent2/source/auxiliary/or/sdraw.cfg
new file mode 100644
index 0000000000..77ec3cc975
--- /dev/null
+++ b/helpcontent2/source/auxiliary/or/sdraw.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Draw
+
+Language=or
+Order=4
+Start=text%2Fsdraw%2Fmain0000.xhp
+Heading=headingheading
+Program=DRAW
diff --git a/helpcontent2/source/auxiliary/or/simpress.cfg b/helpcontent2/source/auxiliary/or/simpress.cfg
new file mode 100644
index 0000000000..685f91d433
--- /dev/null
+++ b/helpcontent2/source/auxiliary/or/simpress.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Impress
+
+Language=or
+Order=5
+Start=text%2Fsimpress%2Fmain0000.xhp
+Heading=headingheading
+Program=IMPRESS
diff --git a/helpcontent2/source/auxiliary/or/smath.cfg b/helpcontent2/source/auxiliary/or/smath.cfg
new file mode 100644
index 0000000000..25a55af8d4
--- /dev/null
+++ b/helpcontent2/source/auxiliary/or/smath.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Math
+
+Language=or
+Order=6
+Start=text%2Fsmath%2Fmain0000.xhp
+Heading=headingheading
+Program=MATH
diff --git a/helpcontent2/source/auxiliary/or/swriter.cfg b/helpcontent2/source/auxiliary/or/swriter.cfg
new file mode 100644
index 0000000000..ff495920e0
--- /dev/null
+++ b/helpcontent2/source/auxiliary/or/swriter.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Writer
+
+Language=or
+Order=2
+Start=text%2Fswriter%2Fmain0000.xhp
+Heading=headingheading
+Program=WRITER
diff --git a/helpcontent2/source/auxiliary/pa-IN/default.css b/helpcontent2/source/auxiliary/pa-IN/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/pa-IN/default.css
+++ b/helpcontent2/source/auxiliary/pa-IN/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/pa-IN/highcontrast1.css b/helpcontent2/source/auxiliary/pa-IN/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/pa-IN/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/pa-IN/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/pa-IN/highcontrast2.css b/helpcontent2/source/auxiliary/pa-IN/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/pa-IN/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/pa-IN/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/pa-IN/highcontrastblack.css b/helpcontent2/source/auxiliary/pa-IN/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/pa-IN/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/pa-IN/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/pa-IN/highcontrastwhite.css b/helpcontent2/source/auxiliary/pa-IN/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/pa-IN/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/pa-IN/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/pa-IN/sbasic.cfg b/helpcontent2/source/auxiliary/pa-IN/sbasic.cfg
index e61a28c5c3..536ec0e8a5 100755..100644
--- a/helpcontent2/source/auxiliary/pa-IN/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/pa-IN/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/pa-IN/scalc.cfg b/helpcontent2/source/auxiliary/pa-IN/scalc.cfg
index 5ab4b091d5..8a4dfa8cd3 100755..100644
--- a/helpcontent2/source/auxiliary/pa-IN/scalc.cfg
+++ b/helpcontent2/source/auxiliary/pa-IN/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/pa-IN/schart.cfg b/helpcontent2/source/auxiliary/pa-IN/schart.cfg
index e979205c23..9d80554053 100755..100644
--- a/helpcontent2/source/auxiliary/pa-IN/schart.cfg
+++ b/helpcontent2/source/auxiliary/pa-IN/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/pa-IN/sdatabase.cfg b/helpcontent2/source/auxiliary/pa-IN/sdatabase.cfg
index d44ccac2ae..032e3419d8 100644
--- a/helpcontent2/source/auxiliary/pa-IN/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/pa-IN/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/pa-IN/sdraw.cfg b/helpcontent2/source/auxiliary/pa-IN/sdraw.cfg
index 29a418fc1a..2b8a32f5e5 100755..100644
--- a/helpcontent2/source/auxiliary/pa-IN/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/pa-IN/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/pa-IN/simpress.cfg b/helpcontent2/source/auxiliary/pa-IN/simpress.cfg
index a6675a2e45..ba7139c69b 100755..100644
--- a/helpcontent2/source/auxiliary/pa-IN/simpress.cfg
+++ b/helpcontent2/source/auxiliary/pa-IN/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/pa-IN/smath.cfg b/helpcontent2/source/auxiliary/pa-IN/smath.cfg
index f42d417cfc..6398858ba2 100755..100644
--- a/helpcontent2/source/auxiliary/pa-IN/smath.cfg
+++ b/helpcontent2/source/auxiliary/pa-IN/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/pa-IN/swriter.cfg b/helpcontent2/source/auxiliary/pa-IN/swriter.cfg
index 6ada775331..9c5f50148b 100755..100644
--- a/helpcontent2/source/auxiliary/pa-IN/swriter.cfg
+++ b/helpcontent2/source/auxiliary/pa-IN/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/pl/default.css b/helpcontent2/source/auxiliary/pl/default.css
index 39c0e7c100..28ca685c53 100755..100644
--- a/helpcontent2/source/auxiliary/pl/default.css
+++ b/helpcontent2/source/auxiliary/pl/default.css
@@ -29,10 +29,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
+	{ font-family: "Albany AMT",Albany,Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Cumberland,Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/pl/highcontrast1.css b/helpcontent2/source/auxiliary/pl/highcontrast1.css
index 7ab33fbbbb..750889d59a 100755..100644
--- a/helpcontent2/source/auxiliary/pl/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/pl/highcontrast1.css
@@ -29,10 +29,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
+	{ font-family: "Albany AMT",Albany,Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Cumberland,Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/pl/highcontrast2.css b/helpcontent2/source/auxiliary/pl/highcontrast2.css
index d375ff58cf..2b497d7dcd 100755..100644
--- a/helpcontent2/source/auxiliary/pl/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/pl/highcontrast2.css
@@ -29,10 +29,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
+	{ font-family: "Albany AMT",Albany,Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Cumberland,Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/pl/highcontrastblack.css b/helpcontent2/source/auxiliary/pl/highcontrastblack.css
index 7e54e4b6ed..f403557596 100755..100644
--- a/helpcontent2/source/auxiliary/pl/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/pl/highcontrastblack.css
@@ -29,10 +29,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
+	{ font-family: "Albany AMT",Albany,Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Cumberland,Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/pl/highcontrastwhite.css b/helpcontent2/source/auxiliary/pl/highcontrastwhite.css
index 2569f38096..03fa815290 100755..100644
--- a/helpcontent2/source/auxiliary/pl/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/pl/highcontrastwhite.css
@@ -28,10 +28,10 @@
 */
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
+	{ font-family: "Albany AMT",Albany,Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Cumberland,Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/pl/sbasic.cfg b/helpcontent2/source/auxiliary/pl/sbasic.cfg
index db504688b6..276661738d 100755..100644
--- a/helpcontent2/source/auxiliary/pl/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/pl/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/pl/scalc.cfg b/helpcontent2/source/auxiliary/pl/scalc.cfg
index 3ca269de9e..49d027f666 100755..100644
--- a/helpcontent2/source/auxiliary/pl/scalc.cfg
+++ b/helpcontent2/source/auxiliary/pl/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/pl/schart.cfg b/helpcontent2/source/auxiliary/pl/schart.cfg
index c3cc114b6d..da9d229775 100755..100644
--- a/helpcontent2/source/auxiliary/pl/schart.cfg
+++ b/helpcontent2/source/auxiliary/pl/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/pl/sdatabase.cfg b/helpcontent2/source/auxiliary/pl/sdatabase.cfg
index c9a7352001..83762eb61b 100644
--- a/helpcontent2/source/auxiliary/pl/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/pl/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/pl/sdraw.cfg b/helpcontent2/source/auxiliary/pl/sdraw.cfg
index e6bc04330b..e04af4f5f7 100755..100644
--- a/helpcontent2/source/auxiliary/pl/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/pl/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/pl/simpress.cfg b/helpcontent2/source/auxiliary/pl/simpress.cfg
index 8df0719ff1..4f02506289 100755..100644
--- a/helpcontent2/source/auxiliary/pl/simpress.cfg
+++ b/helpcontent2/source/auxiliary/pl/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/pl/smath.cfg b/helpcontent2/source/auxiliary/pl/smath.cfg
index aec0ca9afe..c97b3fb358 100755..100644
--- a/helpcontent2/source/auxiliary/pl/smath.cfg
+++ b/helpcontent2/source/auxiliary/pl/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/pl/swriter.cfg b/helpcontent2/source/auxiliary/pl/swriter.cfg
index fc57df24e9..b851ef23a7 100755..100644
--- a/helpcontent2/source/auxiliary/pl/swriter.cfg
+++ b/helpcontent2/source/auxiliary/pl/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/pt-BR/default.css b/helpcontent2/source/auxiliary/pt-BR/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/pt-BR/default.css
+++ b/helpcontent2/source/auxiliary/pt-BR/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/pt-BR/highcontrast1.css b/helpcontent2/source/auxiliary/pt-BR/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/pt-BR/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/pt-BR/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/pt-BR/highcontrast2.css b/helpcontent2/source/auxiliary/pt-BR/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/pt-BR/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/pt-BR/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/pt-BR/highcontrastblack.css b/helpcontent2/source/auxiliary/pt-BR/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/pt-BR/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/pt-BR/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/pt-BR/highcontrastwhite.css b/helpcontent2/source/auxiliary/pt-BR/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/pt-BR/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/pt-BR/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/pt-BR/sbasic.cfg b/helpcontent2/source/auxiliary/pt-BR/sbasic.cfg
index 2658a7f780..9cd5b97bbe 100755..100644
--- a/helpcontent2/source/auxiliary/pt-BR/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/pt-BR/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/pt-BR/scalc.cfg b/helpcontent2/source/auxiliary/pt-BR/scalc.cfg
index 3ad81b1542..76c6a6eff2 100755..100644
--- a/helpcontent2/source/auxiliary/pt-BR/scalc.cfg
+++ b/helpcontent2/source/auxiliary/pt-BR/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/pt-BR/schart.cfg b/helpcontent2/source/auxiliary/pt-BR/schart.cfg
index 1e5b8ec86a..547d7606ef 100755..100644
--- a/helpcontent2/source/auxiliary/pt-BR/schart.cfg
+++ b/helpcontent2/source/auxiliary/pt-BR/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/pt-BR/sdatabase.cfg b/helpcontent2/source/auxiliary/pt-BR/sdatabase.cfg
index 282c235699..6a5c6d6f83 100644
--- a/helpcontent2/source/auxiliary/pt-BR/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/pt-BR/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/pt-BR/sdraw.cfg b/helpcontent2/source/auxiliary/pt-BR/sdraw.cfg
index a06e01d7ed..be881601db 100755..100644
--- a/helpcontent2/source/auxiliary/pt-BR/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/pt-BR/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/pt-BR/simpress.cfg b/helpcontent2/source/auxiliary/pt-BR/simpress.cfg
index 5a83b67279..e409352007 100755..100644
--- a/helpcontent2/source/auxiliary/pt-BR/simpress.cfg
+++ b/helpcontent2/source/auxiliary/pt-BR/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/pt-BR/smath.cfg b/helpcontent2/source/auxiliary/pt-BR/smath.cfg
index 04f65f10ec..dce9931b61 100755..100644
--- a/helpcontent2/source/auxiliary/pt-BR/smath.cfg
+++ b/helpcontent2/source/auxiliary/pt-BR/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/pt-BR/swriter.cfg b/helpcontent2/source/auxiliary/pt-BR/swriter.cfg
index 4e7d268fab..a6202c0c4d 100755..100644
--- a/helpcontent2/source/auxiliary/pt-BR/swriter.cfg
+++ b/helpcontent2/source/auxiliary/pt-BR/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/pt/default.css b/helpcontent2/source/auxiliary/pt/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/pt/default.css
+++ b/helpcontent2/source/auxiliary/pt/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/pt/highcontrast1.css b/helpcontent2/source/auxiliary/pt/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/pt/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/pt/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/pt/highcontrast2.css b/helpcontent2/source/auxiliary/pt/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/pt/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/pt/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/pt/highcontrastblack.css b/helpcontent2/source/auxiliary/pt/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/pt/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/pt/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/pt/highcontrastwhite.css b/helpcontent2/source/auxiliary/pt/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/pt/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/pt/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/pt/sbasic.cfg b/helpcontent2/source/auxiliary/pt/sbasic.cfg
index e55f94e453..18cdd36716 100755..100644
--- a/helpcontent2/source/auxiliary/pt/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/pt/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/pt/scalc.cfg b/helpcontent2/source/auxiliary/pt/scalc.cfg
index eff578d5ec..e89cfda942 100755..100644
--- a/helpcontent2/source/auxiliary/pt/scalc.cfg
+++ b/helpcontent2/source/auxiliary/pt/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/pt/schart.cfg b/helpcontent2/source/auxiliary/pt/schart.cfg
index 92e72bbb24..2ab55d96b5 100755..100644
--- a/helpcontent2/source/auxiliary/pt/schart.cfg
+++ b/helpcontent2/source/auxiliary/pt/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/pt/sdatabase.cfg b/helpcontent2/source/auxiliary/pt/sdatabase.cfg
index afeb7365c1..5b305a7312 100644
--- a/helpcontent2/source/auxiliary/pt/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/pt/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/pt/sdraw.cfg b/helpcontent2/source/auxiliary/pt/sdraw.cfg
index 84692516c4..b1c53845cb 100755..100644
--- a/helpcontent2/source/auxiliary/pt/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/pt/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/pt/simpress.cfg b/helpcontent2/source/auxiliary/pt/simpress.cfg
index 7ac0ebe2ea..5096ab2e77 100755..100644
--- a/helpcontent2/source/auxiliary/pt/simpress.cfg
+++ b/helpcontent2/source/auxiliary/pt/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/pt/smath.cfg b/helpcontent2/source/auxiliary/pt/smath.cfg
index bf0d246440..b5ba02c527 100755..100644
--- a/helpcontent2/source/auxiliary/pt/smath.cfg
+++ b/helpcontent2/source/auxiliary/pt/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/pt/swriter.cfg b/helpcontent2/source/auxiliary/pt/swriter.cfg
index 4dfe80ce19..cb5c1ad28f 100755..100644
--- a/helpcontent2/source/auxiliary/pt/swriter.cfg
+++ b/helpcontent2/source/auxiliary/pt/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ro/default.css b/helpcontent2/source/auxiliary/ro/default.css
new file mode 100644
index 0000000000..bcdc5f4e61
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ro/default.css
@@ -0,0 +1,73 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                          DEFAULT STYLESHEET                       +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold; }
+
+.related
+	{ font-weight: bold; margin-top:20pt; border-top: 1px solid black;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; border: 1px solid #999999; background: #FFFFFF; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; margin-top: 2px; margin-bottom: 2px;}
+
+h1
+	{ font-size: 18pt; border-bottom: 1px solid black; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.howtoget
+	{ background:#EEEEEE;}
+
+.howtogetbody
+	{ background:#EEEEEE; margin: 0px;}
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+.debug
+	{ border: 1px solid black; padding: 3px; display: none;}
diff --git a/helpcontent2/source/auxiliary/ro/highcontrast1.css b/helpcontent2/source/auxiliary/ro/highcontrast1.css
new file mode 100644
index 0000000000..1b44518acd
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ro/highcontrast1.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #1 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFF00;}
+
+.related 
+	{ border-top: 1px solid #FFFF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/ro/highcontrast2.css b/helpcontent2/source/auxiliary/ro/highcontrast2.css
new file mode 100644
index 0000000000..6f934a4196
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ro/highcontrast2.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #2 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #00FF00;}
+
+.related 
+	{ border-top: 1px solid #00FF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #00FF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #00FF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/ro/highcontrastblack.css b/helpcontent2/source/auxiliary/ro/highcontrastblack.css
new file mode 100644
index 0000000000..87c4b7e310
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ro/highcontrastblack.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST BLACK STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFFFF;}
+
+.related 
+	{ border-top: 1px solid #FFFFFF; }
+
+.howtogetheader
+	{border: 1px solid #FFFFFF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFFFF; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFFFF; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/ro/highcontrastwhite.css b/helpcontent2/source/auxiliary/ro/highcontrastwhite.css
new file mode 100644
index 0000000000..9c8bbe469e
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ro/highcontrastwhite.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST WHITE STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #FFFFFF; color: #000000;}
+
+.related 
+	{ border-top: 1px solid #000000; }
+
+.howtogetheader
+	{border: 1px solid #000000; background: #FFFFFF;}
+
+h1 
+	{ border-bottom: 1px solid #000000; ]
+
+.howtoget
+	{ background:#FFFFFF;}
+
+.howtogetbody
+	{ background:#FFFFFF;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #000000; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/ro/sbasic.cfg b/helpcontent2/source/auxiliary/ro/sbasic.cfg
new file mode 100644
index 0000000000..ed67dd993d
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ro/sbasic.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Basic
+
+Language=ro
+Order=7
+Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
+Heading=headingheading
+Program=BASIC 
diff --git a/helpcontent2/source/auxiliary/ro/scalc.cfg b/helpcontent2/source/auxiliary/ro/scalc.cfg
new file mode 100644
index 0000000000..82281734ab
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ro/scalc.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Calc
+
+Language=ro
+Order=3
+Start=text%2Fscalc%2Fmain0000.xhp
+Heading=headingheading
+Program=CALC
diff --git a/helpcontent2/source/auxiliary/ro/schart.cfg b/helpcontent2/source/auxiliary/ro/schart.cfg
new file mode 100644
index 0000000000..e19d45d81e
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ro/schart.cfg
@@ -0,0 +1,8 @@
+Title=%PRODUCTNAME Chart
+
+Language=ro
+Order=4
+Start=text%2Fschart%2Fmain0000.xhp
+Heading=headingheading
+Program=CHART
+
diff --git a/helpcontent2/source/auxiliary/ro/sdatabase.cfg b/helpcontent2/source/auxiliary/ro/sdatabase.cfg
new file mode 100644
index 0000000000..055cd9add4
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ro/sdatabase.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Base
+
+Language=ro
+Order=7
+Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
+Heading=headingheading
+Program=DATABASE 
diff --git a/helpcontent2/source/auxiliary/ro/sdraw.cfg b/helpcontent2/source/auxiliary/ro/sdraw.cfg
new file mode 100644
index 0000000000..4b7549dea6
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ro/sdraw.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Draw
+
+Language=ro
+Order=4
+Start=text%2Fsdraw%2Fmain0000.xhp
+Heading=headingheading
+Program=DRAW
diff --git a/helpcontent2/source/auxiliary/ro/simpress.cfg b/helpcontent2/source/auxiliary/ro/simpress.cfg
new file mode 100644
index 0000000000..a313dbfc11
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ro/simpress.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Impress
+
+Language=ro
+Order=5
+Start=text%2Fsimpress%2Fmain0000.xhp
+Heading=headingheading
+Program=IMPRESS
diff --git a/helpcontent2/source/auxiliary/ro/smath.cfg b/helpcontent2/source/auxiliary/ro/smath.cfg
new file mode 100644
index 0000000000..73d8ffe2f9
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ro/smath.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Math
+
+Language=ro
+Order=6
+Start=text%2Fsmath%2Fmain0000.xhp
+Heading=headingheading
+Program=MATH
diff --git a/helpcontent2/source/auxiliary/ro/swriter.cfg b/helpcontent2/source/auxiliary/ro/swriter.cfg
new file mode 100644
index 0000000000..f9361246ba
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ro/swriter.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Writer
+
+Language=ro
+Order=2
+Start=text%2Fswriter%2Fmain0000.xhp
+Heading=headingheading
+Program=WRITER
diff --git a/helpcontent2/source/auxiliary/ru/default.css b/helpcontent2/source/auxiliary/ru/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/ru/default.css
+++ b/helpcontent2/source/auxiliary/ru/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/ru/highcontrast1.css b/helpcontent2/source/auxiliary/ru/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/ru/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/ru/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ru/highcontrast2.css b/helpcontent2/source/auxiliary/ru/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/ru/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/ru/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ru/highcontrastblack.css b/helpcontent2/source/auxiliary/ru/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/ru/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/ru/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ru/highcontrastwhite.css b/helpcontent2/source/auxiliary/ru/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/ru/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/ru/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ru/sbasic.cfg b/helpcontent2/source/auxiliary/ru/sbasic.cfg
index cd4fac7960..a942b12dfc 100755..100644
--- a/helpcontent2/source/auxiliary/ru/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/ru/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ru/scalc.cfg b/helpcontent2/source/auxiliary/ru/scalc.cfg
index 21d78c7433..c9a0260824 100755..100644
--- a/helpcontent2/source/auxiliary/ru/scalc.cfg
+++ b/helpcontent2/source/auxiliary/ru/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ru/schart.cfg b/helpcontent2/source/auxiliary/ru/schart.cfg
index 1f6192d177..e005b9bdb8 100755..100644
--- a/helpcontent2/source/auxiliary/ru/schart.cfg
+++ b/helpcontent2/source/auxiliary/ru/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/ru/sdatabase.cfg b/helpcontent2/source/auxiliary/ru/sdatabase.cfg
index 305ae95e6f..ca06c80477 100644
--- a/helpcontent2/source/auxiliary/ru/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/ru/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ru/sdraw.cfg b/helpcontent2/source/auxiliary/ru/sdraw.cfg
index ff9ac87add..b50ce0987b 100755..100644
--- a/helpcontent2/source/auxiliary/ru/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/ru/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ru/simpress.cfg b/helpcontent2/source/auxiliary/ru/simpress.cfg
index ad9eb84f32..5bd2709b93 100755..100644
--- a/helpcontent2/source/auxiliary/ru/simpress.cfg
+++ b/helpcontent2/source/auxiliary/ru/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ru/smath.cfg b/helpcontent2/source/auxiliary/ru/smath.cfg
index 35713a985f..64edc6369d 100755..100644
--- a/helpcontent2/source/auxiliary/ru/smath.cfg
+++ b/helpcontent2/source/auxiliary/ru/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ru/swriter.cfg b/helpcontent2/source/auxiliary/ru/swriter.cfg
index 26cd773220..56bf7f14b0 100755..100644
--- a/helpcontent2/source/auxiliary/ru/swriter.cfg
+++ b/helpcontent2/source/auxiliary/ru/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/rw/default.css b/helpcontent2/source/auxiliary/rw/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/rw/default.css
+++ b/helpcontent2/source/auxiliary/rw/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/rw/highcontrast1.css b/helpcontent2/source/auxiliary/rw/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/rw/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/rw/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/rw/highcontrast2.css b/helpcontent2/source/auxiliary/rw/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/rw/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/rw/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/rw/highcontrastblack.css b/helpcontent2/source/auxiliary/rw/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/rw/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/rw/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/rw/highcontrastwhite.css b/helpcontent2/source/auxiliary/rw/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/rw/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/rw/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/rw/sbasic.cfg b/helpcontent2/source/auxiliary/rw/sbasic.cfg
index bac7df8f8b..b95c86494c 100755..100644
--- a/helpcontent2/source/auxiliary/rw/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/rw/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/rw/scalc.cfg b/helpcontent2/source/auxiliary/rw/scalc.cfg
index 278fc41ba9..cf84cc663c 100755..100644
--- a/helpcontent2/source/auxiliary/rw/scalc.cfg
+++ b/helpcontent2/source/auxiliary/rw/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/rw/schart.cfg b/helpcontent2/source/auxiliary/rw/schart.cfg
index 2b50253c2e..17910d17a1 100755..100644
--- a/helpcontent2/source/auxiliary/rw/schart.cfg
+++ b/helpcontent2/source/auxiliary/rw/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/rw/sdatabase.cfg b/helpcontent2/source/auxiliary/rw/sdatabase.cfg
index 063978af50..06a3139f70 100644
--- a/helpcontent2/source/auxiliary/rw/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/rw/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/rw/sdraw.cfg b/helpcontent2/source/auxiliary/rw/sdraw.cfg
index 508badc0a7..5a8fd59800 100755..100644
--- a/helpcontent2/source/auxiliary/rw/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/rw/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/rw/simpress.cfg b/helpcontent2/source/auxiliary/rw/simpress.cfg
index fc92c1f05d..c745cae8ad 100755..100644
--- a/helpcontent2/source/auxiliary/rw/simpress.cfg
+++ b/helpcontent2/source/auxiliary/rw/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/rw/smath.cfg b/helpcontent2/source/auxiliary/rw/smath.cfg
index cc332abc75..00ef1117c5 100755..100644
--- a/helpcontent2/source/auxiliary/rw/smath.cfg
+++ b/helpcontent2/source/auxiliary/rw/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/rw/swriter.cfg b/helpcontent2/source/auxiliary/rw/swriter.cfg
index 6b157683d4..e68484499f 100755..100644
--- a/helpcontent2/source/auxiliary/rw/swriter.cfg
+++ b/helpcontent2/source/auxiliary/rw/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sa-IN/default.css b/helpcontent2/source/auxiliary/sa-IN/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/sa-IN/default.css
+++ b/helpcontent2/source/auxiliary/sa-IN/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/sa-IN/highcontrast1.css b/helpcontent2/source/auxiliary/sa-IN/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/sa-IN/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/sa-IN/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sa-IN/highcontrast2.css b/helpcontent2/source/auxiliary/sa-IN/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/sa-IN/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/sa-IN/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sa-IN/highcontrastblack.css b/helpcontent2/source/auxiliary/sa-IN/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/sa-IN/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/sa-IN/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sa-IN/highcontrastwhite.css b/helpcontent2/source/auxiliary/sa-IN/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/sa-IN/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/sa-IN/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sa-IN/sbasic.cfg b/helpcontent2/source/auxiliary/sa-IN/sbasic.cfg
index fdf62ab0d2..373be974ae 100644
--- a/helpcontent2/source/auxiliary/sa-IN/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/sa-IN/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sa-IN/scalc.cfg b/helpcontent2/source/auxiliary/sa-IN/scalc.cfg
index 8643e01db2..b6812e3b12 100644
--- a/helpcontent2/source/auxiliary/sa-IN/scalc.cfg
+++ b/helpcontent2/source/auxiliary/sa-IN/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sa-IN/schart.cfg b/helpcontent2/source/auxiliary/sa-IN/schart.cfg
index cbd138b7ca..d1e09b786e 100644
--- a/helpcontent2/source/auxiliary/sa-IN/schart.cfg
+++ b/helpcontent2/source/auxiliary/sa-IN/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/sa-IN/sdatabase.cfg b/helpcontent2/source/auxiliary/sa-IN/sdatabase.cfg
index 3241887a7a..905b056846 100644
--- a/helpcontent2/source/auxiliary/sa-IN/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/sa-IN/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sa-IN/sdraw.cfg b/helpcontent2/source/auxiliary/sa-IN/sdraw.cfg
index 44f49e99b9..4595b86f0c 100644
--- a/helpcontent2/source/auxiliary/sa-IN/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/sa-IN/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sa-IN/simpress.cfg b/helpcontent2/source/auxiliary/sa-IN/simpress.cfg
index 7b78fe886e..5189c8e6f6 100644
--- a/helpcontent2/source/auxiliary/sa-IN/simpress.cfg
+++ b/helpcontent2/source/auxiliary/sa-IN/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sa-IN/smath.cfg b/helpcontent2/source/auxiliary/sa-IN/smath.cfg
index a0dae05d09..398b0ec57c 100644
--- a/helpcontent2/source/auxiliary/sa-IN/smath.cfg
+++ b/helpcontent2/source/auxiliary/sa-IN/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sa-IN/swriter.cfg b/helpcontent2/source/auxiliary/sa-IN/swriter.cfg
index ffff089ca0..f81c225f15 100644
--- a/helpcontent2/source/auxiliary/sa-IN/swriter.cfg
+++ b/helpcontent2/source/auxiliary/sa-IN/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sat/default.css b/helpcontent2/source/auxiliary/sat/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/sat/default.css
+++ b/helpcontent2/source/auxiliary/sat/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/sat/highcontrast1.css b/helpcontent2/source/auxiliary/sat/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/sat/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/sat/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sat/highcontrast2.css b/helpcontent2/source/auxiliary/sat/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/sat/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/sat/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sat/highcontrastblack.css b/helpcontent2/source/auxiliary/sat/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/sat/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/sat/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sat/highcontrastwhite.css b/helpcontent2/source/auxiliary/sat/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/sat/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/sat/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sat/sbasic.cfg b/helpcontent2/source/auxiliary/sat/sbasic.cfg
index 84ad20b9c1..27f828fe7c 100644
--- a/helpcontent2/source/auxiliary/sat/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/sat/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sat/scalc.cfg b/helpcontent2/source/auxiliary/sat/scalc.cfg
index e7f0fab961..d7c6ac5650 100644
--- a/helpcontent2/source/auxiliary/sat/scalc.cfg
+++ b/helpcontent2/source/auxiliary/sat/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sat/schart.cfg b/helpcontent2/source/auxiliary/sat/schart.cfg
index 88d40d5e5d..42a46fa4af 100644
--- a/helpcontent2/source/auxiliary/sat/schart.cfg
+++ b/helpcontent2/source/auxiliary/sat/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/sat/sdatabase.cfg b/helpcontent2/source/auxiliary/sat/sdatabase.cfg
index d8f33a31e3..3ba5ac6f71 100644
--- a/helpcontent2/source/auxiliary/sat/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/sat/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sat/sdraw.cfg b/helpcontent2/source/auxiliary/sat/sdraw.cfg
index e10ba92083..a10da7826d 100644
--- a/helpcontent2/source/auxiliary/sat/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/sat/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sat/simpress.cfg b/helpcontent2/source/auxiliary/sat/simpress.cfg
index 86e56e2100..aa53c22215 100644
--- a/helpcontent2/source/auxiliary/sat/simpress.cfg
+++ b/helpcontent2/source/auxiliary/sat/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sat/smath.cfg b/helpcontent2/source/auxiliary/sat/smath.cfg
index 091975e31d..51f28a4143 100644
--- a/helpcontent2/source/auxiliary/sat/smath.cfg
+++ b/helpcontent2/source/auxiliary/sat/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sat/swriter.cfg b/helpcontent2/source/auxiliary/sat/swriter.cfg
index f22eff5532..4bb988df04 100644
--- a/helpcontent2/source/auxiliary/sat/swriter.cfg
+++ b/helpcontent2/source/auxiliary/sat/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sbasic.tree b/helpcontent2/source/auxiliary/sbasic.tree
index 8766b4a7c6..8766b4a7c6 100755..100644
--- a/helpcontent2/source/auxiliary/sbasic.tree
+++ b/helpcontent2/source/auxiliary/sbasic.tree
diff --git a/helpcontent2/source/auxiliary/scalc.tree b/helpcontent2/source/auxiliary/scalc.tree
index 087ee9ce84..8c5b0c2c35 100755..100644
--- a/helpcontent2/source/auxiliary/scalc.tree
+++ b/helpcontent2/source/auxiliary/scalc.tree
@@ -33,7 +33,6 @@
 <topic id="scalc/text/scalc/main0214.xhp">Picture Bar</topic>
 <topic id="scalc/text/scalc/main0218.xhp">Tools Bar</topic>
 <topic id="shared/text/shared/main0201.xhp">Standard Bar</topic>
-<topic id="shared/text/shared/main0209.xhp">Hyperlink Bar</topic>
 <topic id="shared/text/shared/main0212.xhp">Table Data Bar</topic>
 <topic id="shared/text/shared/main0213.xhp">Form Navigation Bar</topic>
 <topic id="shared/text/shared/main0214.xhp">Query Design Bar</topic>
diff --git a/helpcontent2/source/auxiliary/schart.tree b/helpcontent2/source/auxiliary/schart.tree
index 1b3866a430..1b3866a430 100755..100644
--- a/helpcontent2/source/auxiliary/schart.tree
+++ b/helpcontent2/source/auxiliary/schart.tree
diff --git a/helpcontent2/source/auxiliary/sd/default.css b/helpcontent2/source/auxiliary/sd/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/sd/default.css
+++ b/helpcontent2/source/auxiliary/sd/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/sd/highcontrast1.css b/helpcontent2/source/auxiliary/sd/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/sd/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/sd/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sd/highcontrast2.css b/helpcontent2/source/auxiliary/sd/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/sd/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/sd/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sd/highcontrastblack.css b/helpcontent2/source/auxiliary/sd/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/sd/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/sd/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sd/highcontrastwhite.css b/helpcontent2/source/auxiliary/sd/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/sd/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/sd/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sd/sbasic.cfg b/helpcontent2/source/auxiliary/sd/sbasic.cfg
index 39894be380..b44db58b22 100644
--- a/helpcontent2/source/auxiliary/sd/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/sd/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sd/scalc.cfg b/helpcontent2/source/auxiliary/sd/scalc.cfg
index 615130dbd7..f4de2db8d3 100644
--- a/helpcontent2/source/auxiliary/sd/scalc.cfg
+++ b/helpcontent2/source/auxiliary/sd/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sd/schart.cfg b/helpcontent2/source/auxiliary/sd/schart.cfg
index c4c286760a..a4e5a9d386 100644
--- a/helpcontent2/source/auxiliary/sd/schart.cfg
+++ b/helpcontent2/source/auxiliary/sd/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/sd/sdatabase.cfg b/helpcontent2/source/auxiliary/sd/sdatabase.cfg
index c8ff8184dd..8d93e14133 100644
--- a/helpcontent2/source/auxiliary/sd/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/sd/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sd/sdraw.cfg b/helpcontent2/source/auxiliary/sd/sdraw.cfg
index ea38c9d2d4..a7efb86823 100644
--- a/helpcontent2/source/auxiliary/sd/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/sd/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sd/simpress.cfg b/helpcontent2/source/auxiliary/sd/simpress.cfg
index 5588f48c57..2c329a18bc 100644
--- a/helpcontent2/source/auxiliary/sd/simpress.cfg
+++ b/helpcontent2/source/auxiliary/sd/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sd/smath.cfg b/helpcontent2/source/auxiliary/sd/smath.cfg
index 6cd3a31e57..a017b76805 100644
--- a/helpcontent2/source/auxiliary/sd/smath.cfg
+++ b/helpcontent2/source/auxiliary/sd/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sd/swriter.cfg b/helpcontent2/source/auxiliary/sd/swriter.cfg
index 2f0ae2ce7f..2dd27e8a05 100644
--- a/helpcontent2/source/auxiliary/sd/swriter.cfg
+++ b/helpcontent2/source/auxiliary/sd/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sh/default.css b/helpcontent2/source/auxiliary/sh/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/sh/default.css
+++ b/helpcontent2/source/auxiliary/sh/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/sh/highcontrast1.css b/helpcontent2/source/auxiliary/sh/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/sh/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/sh/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sh/highcontrast2.css b/helpcontent2/source/auxiliary/sh/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/sh/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/sh/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sh/highcontrastblack.css b/helpcontent2/source/auxiliary/sh/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/sh/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/sh/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sh/highcontrastwhite.css b/helpcontent2/source/auxiliary/sh/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/sh/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/sh/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sh/sbasic.cfg b/helpcontent2/source/auxiliary/sh/sbasic.cfg
index 4a915bb5da..a42fecc976 100755..100644
--- a/helpcontent2/source/auxiliary/sh/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/sh/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sh/scalc.cfg b/helpcontent2/source/auxiliary/sh/scalc.cfg
index a6ba23c241..d6890e0da4 100755..100644
--- a/helpcontent2/source/auxiliary/sh/scalc.cfg
+++ b/helpcontent2/source/auxiliary/sh/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sh/schart.cfg b/helpcontent2/source/auxiliary/sh/schart.cfg
index 49a58e0325..ae5b61fce6 100755..100644
--- a/helpcontent2/source/auxiliary/sh/schart.cfg
+++ b/helpcontent2/source/auxiliary/sh/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/sh/sdatabase.cfg b/helpcontent2/source/auxiliary/sh/sdatabase.cfg
index 370d5667cc..7f2aebde2f 100644
--- a/helpcontent2/source/auxiliary/sh/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/sh/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sh/sdraw.cfg b/helpcontent2/source/auxiliary/sh/sdraw.cfg
index d92577d2d6..63bca0c65e 100755..100644
--- a/helpcontent2/source/auxiliary/sh/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/sh/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sh/simpress.cfg b/helpcontent2/source/auxiliary/sh/simpress.cfg
index 18ae6b4257..6602834a76 100755..100644
--- a/helpcontent2/source/auxiliary/sh/simpress.cfg
+++ b/helpcontent2/source/auxiliary/sh/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sh/smath.cfg b/helpcontent2/source/auxiliary/sh/smath.cfg
index 9c6d1ffe16..8ae97008fa 100755..100644
--- a/helpcontent2/source/auxiliary/sh/smath.cfg
+++ b/helpcontent2/source/auxiliary/sh/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sh/swriter.cfg b/helpcontent2/source/auxiliary/sh/swriter.cfg
index b50fd35d0a..7b67ee8c2c 100755..100644
--- a/helpcontent2/source/auxiliary/sh/swriter.cfg
+++ b/helpcontent2/source/auxiliary/sh/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/shared.tree b/helpcontent2/source/auxiliary/shared.tree
index 68c79835bf..1b2917b79a 100755..100644
--- a/helpcontent2/source/auxiliary/shared.tree
+++ b/helpcontent2/source/auxiliary/shared.tree
@@ -147,7 +147,6 @@
 		</node>
 		<node id="1020" title="Searching and Replacing">
 <topic id="shared/text/shared/guide/data_search2.xhp">Searching With a Form Filter</topic>
-<topic id="shared/text/shared/guide/hyperlink_search.xhp">Searching With the Hyperlink Bar</topic>
 <topic id="shared/text/shared/guide/data_search.xhp">Searching Tables and Form Documents</topic>
 <topic id="shared/text/shared/01/02100001.xhp">List of Regular Expressions</topic>
 		</node>
diff --git a/helpcontent2/source/auxiliary/si/default.css b/helpcontent2/source/auxiliary/si/default.css
new file mode 100644
index 0000000000..bcdc5f4e61
--- /dev/null
+++ b/helpcontent2/source/auxiliary/si/default.css
@@ -0,0 +1,73 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                          DEFAULT STYLESHEET                       +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold; }
+
+.related
+	{ font-weight: bold; margin-top:20pt; border-top: 1px solid black;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; border: 1px solid #999999; background: #FFFFFF; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; margin-top: 2px; margin-bottom: 2px;}
+
+h1
+	{ font-size: 18pt; border-bottom: 1px solid black; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.howtoget
+	{ background:#EEEEEE;}
+
+.howtogetbody
+	{ background:#EEEEEE; margin: 0px;}
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+.debug
+	{ border: 1px solid black; padding: 3px; display: none;}
diff --git a/helpcontent2/source/auxiliary/si/highcontrast1.css b/helpcontent2/source/auxiliary/si/highcontrast1.css
new file mode 100644
index 0000000000..1b44518acd
--- /dev/null
+++ b/helpcontent2/source/auxiliary/si/highcontrast1.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #1 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFF00;}
+
+.related 
+	{ border-top: 1px solid #FFFF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/si/highcontrast2.css b/helpcontent2/source/auxiliary/si/highcontrast2.css
new file mode 100644
index 0000000000..6f934a4196
--- /dev/null
+++ b/helpcontent2/source/auxiliary/si/highcontrast2.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #2 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #00FF00;}
+
+.related 
+	{ border-top: 1px solid #00FF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #00FF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #00FF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/si/highcontrastblack.css b/helpcontent2/source/auxiliary/si/highcontrastblack.css
new file mode 100644
index 0000000000..87c4b7e310
--- /dev/null
+++ b/helpcontent2/source/auxiliary/si/highcontrastblack.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST BLACK STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFFFF;}
+
+.related 
+	{ border-top: 1px solid #FFFFFF; }
+
+.howtogetheader
+	{border: 1px solid #FFFFFF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFFFF; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFFFF; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/si/highcontrastwhite.css b/helpcontent2/source/auxiliary/si/highcontrastwhite.css
new file mode 100644
index 0000000000..9c8bbe469e
--- /dev/null
+++ b/helpcontent2/source/auxiliary/si/highcontrastwhite.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST WHITE STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #FFFFFF; color: #000000;}
+
+.related 
+	{ border-top: 1px solid #000000; }
+
+.howtogetheader
+	{border: 1px solid #000000; background: #FFFFFF;}
+
+h1 
+	{ border-bottom: 1px solid #000000; ]
+
+.howtoget
+	{ background:#FFFFFF;}
+
+.howtogetbody
+	{ background:#FFFFFF;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #000000; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/si/sbasic.cfg b/helpcontent2/source/auxiliary/si/sbasic.cfg
new file mode 100644
index 0000000000..8d8570f716
--- /dev/null
+++ b/helpcontent2/source/auxiliary/si/sbasic.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Basic
+
+Language=si
+Order=7
+Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
+Heading=headingheading
+Program=BASIC 
diff --git a/helpcontent2/source/auxiliary/si/scalc.cfg b/helpcontent2/source/auxiliary/si/scalc.cfg
new file mode 100644
index 0000000000..c1aee821a8
--- /dev/null
+++ b/helpcontent2/source/auxiliary/si/scalc.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Calc
+
+Language=si
+Order=3
+Start=text%2Fscalc%2Fmain0000.xhp
+Heading=headingheading
+Program=CALC
diff --git a/helpcontent2/source/auxiliary/si/schart.cfg b/helpcontent2/source/auxiliary/si/schart.cfg
new file mode 100644
index 0000000000..f0b61835ec
--- /dev/null
+++ b/helpcontent2/source/auxiliary/si/schart.cfg
@@ -0,0 +1,8 @@
+Title=%PRODUCTNAME Chart
+
+Language=si
+Order=4
+Start=text%2Fschart%2Fmain0000.xhp
+Heading=headingheading
+Program=CHART
+
diff --git a/helpcontent2/source/auxiliary/si/sdatabase.cfg b/helpcontent2/source/auxiliary/si/sdatabase.cfg
new file mode 100644
index 0000000000..735ef48546
--- /dev/null
+++ b/helpcontent2/source/auxiliary/si/sdatabase.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Base
+
+Language=si
+Order=7
+Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
+Heading=headingheading
+Program=DATABASE 
diff --git a/helpcontent2/source/auxiliary/si/sdraw.cfg b/helpcontent2/source/auxiliary/si/sdraw.cfg
new file mode 100644
index 0000000000..a969afa4c3
--- /dev/null
+++ b/helpcontent2/source/auxiliary/si/sdraw.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Draw
+
+Language=si
+Order=4
+Start=text%2Fsdraw%2Fmain0000.xhp
+Heading=headingheading
+Program=DRAW
diff --git a/helpcontent2/source/auxiliary/si/simpress.cfg b/helpcontent2/source/auxiliary/si/simpress.cfg
new file mode 100644
index 0000000000..057659b5ae
--- /dev/null
+++ b/helpcontent2/source/auxiliary/si/simpress.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Impress
+
+Language=si
+Order=5
+Start=text%2Fsimpress%2Fmain0000.xhp
+Heading=headingheading
+Program=IMPRESS
diff --git a/helpcontent2/source/auxiliary/si/smath.cfg b/helpcontent2/source/auxiliary/si/smath.cfg
new file mode 100644
index 0000000000..e1989e1d7f
--- /dev/null
+++ b/helpcontent2/source/auxiliary/si/smath.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Math
+
+Language=si
+Order=6
+Start=text%2Fsmath%2Fmain0000.xhp
+Heading=headingheading
+Program=MATH
diff --git a/helpcontent2/source/auxiliary/si/swriter.cfg b/helpcontent2/source/auxiliary/si/swriter.cfg
new file mode 100644
index 0000000000..da00af6d9c
--- /dev/null
+++ b/helpcontent2/source/auxiliary/si/swriter.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Writer
+
+Language=si
+Order=2
+Start=text%2Fswriter%2Fmain0000.xhp
+Heading=headingheading
+Program=WRITER
diff --git a/helpcontent2/source/auxiliary/simpress.tree b/helpcontent2/source/auxiliary/simpress.tree
index 2470682c1a..d1257acac3 100755..100644
--- a/helpcontent2/source/auxiliary/simpress.tree
+++ b/helpcontent2/source/auxiliary/simpress.tree
@@ -39,7 +39,6 @@
 <topic id="simpress/text/simpress/main0213.xhp">Options Bar</topic>
 <topic id="simpress/text/simpress/main0214.xhp">Picture Bar</topic>
 <topic id="shared/text/shared/main0201.xhp">Standard Bar</topic>
-<topic id="shared/text/shared/main0209.xhp">Hyperlink Bar</topic>
 <topic id="shared/text/shared/main0213.xhp">Form Navigation Bar</topic>
 <topic id="shared/text/shared/main0226.xhp">Form Design Toolbar</topic>
 <topic id="shared/text/shared/main0227.xhp">Edit Points Bar</topic>
@@ -61,7 +60,6 @@
 <topic id="sdraw/text/sdraw/main0210.xhp">Drawing Bar</topic>
 <topic id="sdraw/text/sdraw/main0213.xhp">Options Bar</topic>
 <topic id="shared/text/shared/main0201.xhp">Standard Bar</topic>
-<topic id="shared/text/shared/main0209.xhp">Hyperlink Bar</topic>
 <topic id="shared/text/shared/main0213.xhp">Form Navigation Bar</topic>
 <topic id="shared/text/shared/main0226.xhp">Form Design Toolbar</topic>
 <topic id="shared/text/shared/main0227.xhp">Edit Points Bar</topic>
diff --git a/helpcontent2/source/auxiliary/sk/default.css b/helpcontent2/source/auxiliary/sk/default.css
index b67f98d9b4..a1c6590831 100755..100644
--- a/helpcontent2/source/auxiliary/sk/default.css
+++ b/helpcontent2/source/auxiliary/sk/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/sk/highcontrast1.css b/helpcontent2/source/auxiliary/sk/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/sk/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/sk/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sk/highcontrast2.css b/helpcontent2/source/auxiliary/sk/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/sk/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/sk/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sk/highcontrastblack.css b/helpcontent2/source/auxiliary/sk/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/sk/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/sk/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sk/highcontrastwhite.css b/helpcontent2/source/auxiliary/sk/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/sk/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/sk/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sk/sbasic.cfg b/helpcontent2/source/auxiliary/sk/sbasic.cfg
index 118d9f83d8..874a2e3b8f 100755..100644
--- a/helpcontent2/source/auxiliary/sk/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/sk/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sk/scalc.cfg b/helpcontent2/source/auxiliary/sk/scalc.cfg
index 985f112009..25369ef6b2 100755..100644
--- a/helpcontent2/source/auxiliary/sk/scalc.cfg
+++ b/helpcontent2/source/auxiliary/sk/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sk/schart.cfg b/helpcontent2/source/auxiliary/sk/schart.cfg
index d6a38d5a89..bb42b9697b 100755..100644
--- a/helpcontent2/source/auxiliary/sk/schart.cfg
+++ b/helpcontent2/source/auxiliary/sk/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/sk/sdatabase.cfg b/helpcontent2/source/auxiliary/sk/sdatabase.cfg
index 287a562b03..349a929c03 100644
--- a/helpcontent2/source/auxiliary/sk/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/sk/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sk/sdraw.cfg b/helpcontent2/source/auxiliary/sk/sdraw.cfg
index a11ba691d9..19b2fd53a9 100755..100644
--- a/helpcontent2/source/auxiliary/sk/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/sk/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sk/simpress.cfg b/helpcontent2/source/auxiliary/sk/simpress.cfg
index 2f22b07f6e..fcfe668bba 100755..100644
--- a/helpcontent2/source/auxiliary/sk/simpress.cfg
+++ b/helpcontent2/source/auxiliary/sk/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sk/smath.cfg b/helpcontent2/source/auxiliary/sk/smath.cfg
index 1f25fd7035..710bb1cd4d 100755..100644
--- a/helpcontent2/source/auxiliary/sk/smath.cfg
+++ b/helpcontent2/source/auxiliary/sk/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sk/swriter.cfg b/helpcontent2/source/auxiliary/sk/swriter.cfg
index d534ad39ed..d4f907f2ef 100755..100644
--- a/helpcontent2/source/auxiliary/sk/swriter.cfg
+++ b/helpcontent2/source/auxiliary/sk/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sl/default.css b/helpcontent2/source/auxiliary/sl/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/sl/default.css
+++ b/helpcontent2/source/auxiliary/sl/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/sl/highcontrast1.css b/helpcontent2/source/auxiliary/sl/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/sl/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/sl/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sl/highcontrast2.css b/helpcontent2/source/auxiliary/sl/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/sl/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/sl/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sl/highcontrastblack.css b/helpcontent2/source/auxiliary/sl/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/sl/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/sl/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sl/highcontrastwhite.css b/helpcontent2/source/auxiliary/sl/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/sl/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/sl/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sl/sbasic.cfg b/helpcontent2/source/auxiliary/sl/sbasic.cfg
index 87b19badf7..77f88ee2cb 100755..100644
--- a/helpcontent2/source/auxiliary/sl/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/sl/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sl/scalc.cfg b/helpcontent2/source/auxiliary/sl/scalc.cfg
index 8183ca05e1..ef1d9ef1bf 100755..100644
--- a/helpcontent2/source/auxiliary/sl/scalc.cfg
+++ b/helpcontent2/source/auxiliary/sl/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sl/schart.cfg b/helpcontent2/source/auxiliary/sl/schart.cfg
index 49857eeb72..61650bb309 100755..100644
--- a/helpcontent2/source/auxiliary/sl/schart.cfg
+++ b/helpcontent2/source/auxiliary/sl/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/sl/sdatabase.cfg b/helpcontent2/source/auxiliary/sl/sdatabase.cfg
index 2457b9338e..d8c7316516 100644
--- a/helpcontent2/source/auxiliary/sl/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/sl/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sl/sdraw.cfg b/helpcontent2/source/auxiliary/sl/sdraw.cfg
index 124dc4f6ab..35583c86c3 100755..100644
--- a/helpcontent2/source/auxiliary/sl/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/sl/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sl/simpress.cfg b/helpcontent2/source/auxiliary/sl/simpress.cfg
index 7c7941dd09..2071f806a8 100755..100644
--- a/helpcontent2/source/auxiliary/sl/simpress.cfg
+++ b/helpcontent2/source/auxiliary/sl/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sl/smath.cfg b/helpcontent2/source/auxiliary/sl/smath.cfg
index aedf648c58..db466ae5aa 100755..100644
--- a/helpcontent2/source/auxiliary/sl/smath.cfg
+++ b/helpcontent2/source/auxiliary/sl/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sl/swriter.cfg b/helpcontent2/source/auxiliary/sl/swriter.cfg
index 34b3235c9d..c4ec315f0b 100755..100644
--- a/helpcontent2/source/auxiliary/sl/swriter.cfg
+++ b/helpcontent2/source/auxiliary/sl/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/smath.tree b/helpcontent2/source/auxiliary/smath.tree
index f0a7bff72d..f0a7bff72d 100755..100644
--- a/helpcontent2/source/auxiliary/smath.tree
+++ b/helpcontent2/source/auxiliary/smath.tree
diff --git a/helpcontent2/source/auxiliary/sq/default.css b/helpcontent2/source/auxiliary/sq/default.css
index 39c0e7c100..28ca685c53 100644
--- a/helpcontent2/source/auxiliary/sq/default.css
+++ b/helpcontent2/source/auxiliary/sq/default.css
@@ -29,10 +29,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
+	{ font-family: "Albany AMT",Albany,Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Cumberland,Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/sq/highcontrast1.css b/helpcontent2/source/auxiliary/sq/highcontrast1.css
index 7ab33fbbbb..750889d59a 100644
--- a/helpcontent2/source/auxiliary/sq/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/sq/highcontrast1.css
@@ -29,10 +29,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
+	{ font-family: "Albany AMT",Albany,Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Cumberland,Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sq/highcontrast2.css b/helpcontent2/source/auxiliary/sq/highcontrast2.css
index 930dfe9605..a539032262 100644
--- a/helpcontent2/source/auxiliary/sq/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/sq/highcontrast2.css
@@ -30,10 +30,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
+	{ font-family: "Albany AMT",Albany,Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Cumberland,Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sq/highcontrastblack.css b/helpcontent2/source/auxiliary/sq/highcontrastblack.css
index 63732b88ff..4a8537e5f2 100644
--- a/helpcontent2/source/auxiliary/sq/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/sq/highcontrastblack.css
@@ -30,10 +30,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
+	{ font-family: "Albany AMT",Albany,Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Cumberland,Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sq/highcontrastwhite.css b/helpcontent2/source/auxiliary/sq/highcontrastwhite.css
index e3743341a0..58d6f9eebd 100644
--- a/helpcontent2/source/auxiliary/sq/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/sq/highcontrastwhite.css
@@ -30,10 +30,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
+	{ font-family: "Albany AMT",Albany,Arial,"DejaVu Sans",FreeSans,"Nimbus Sans L","Arial Unicode MS","Lucida Sans Unicode",Tahoma,Lucida,Helvetica,Helmet,"Bitstream Vera Sans",sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Cumberland,Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","DejaVu Sans Mono",FreeMono,"Nimbus Mono L","Lucida Sans Typewriter","Lucida Typewriter","Bitstream Vera Sans Mono",Courier,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sq/sbasic.cfg b/helpcontent2/source/auxiliary/sq/sbasic.cfg
index 35ebef6a2b..abf358cd71 100644
--- a/helpcontent2/source/auxiliary/sq/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/sq/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sq/scalc.cfg b/helpcontent2/source/auxiliary/sq/scalc.cfg
index dc491b1025..65dbc27058 100644
--- a/helpcontent2/source/auxiliary/sq/scalc.cfg
+++ b/helpcontent2/source/auxiliary/sq/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sq/schart.cfg b/helpcontent2/source/auxiliary/sq/schart.cfg
index 81b3ecc13a..18510d9f93 100755..100644
--- a/helpcontent2/source/auxiliary/sq/schart.cfg
+++ b/helpcontent2/source/auxiliary/sq/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/sq/sdatabase.cfg b/helpcontent2/source/auxiliary/sq/sdatabase.cfg
index 4cfe0a2461..a16186c244 100644
--- a/helpcontent2/source/auxiliary/sq/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/sq/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sq/sdraw.cfg b/helpcontent2/source/auxiliary/sq/sdraw.cfg
index dfb6013ba3..034e77964a 100644
--- a/helpcontent2/source/auxiliary/sq/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/sq/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sq/simpress.cfg b/helpcontent2/source/auxiliary/sq/simpress.cfg
index 18995d359a..cc71a47b2a 100644
--- a/helpcontent2/source/auxiliary/sq/simpress.cfg
+++ b/helpcontent2/source/auxiliary/sq/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sq/smath.cfg b/helpcontent2/source/auxiliary/sq/smath.cfg
index 48e866890a..8a4006972f 100644
--- a/helpcontent2/source/auxiliary/sq/smath.cfg
+++ b/helpcontent2/source/auxiliary/sq/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sq/swriter.cfg b/helpcontent2/source/auxiliary/sq/swriter.cfg
index b754e81cb6..86d51fab9e 100644
--- a/helpcontent2/source/auxiliary/sq/swriter.cfg
+++ b/helpcontent2/source/auxiliary/sq/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sr/default.css b/helpcontent2/source/auxiliary/sr/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/sr/default.css
+++ b/helpcontent2/source/auxiliary/sr/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/sr/highcontrast1.css b/helpcontent2/source/auxiliary/sr/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/sr/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/sr/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sr/highcontrast2.css b/helpcontent2/source/auxiliary/sr/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/sr/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/sr/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sr/highcontrastblack.css b/helpcontent2/source/auxiliary/sr/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/sr/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/sr/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sr/highcontrastwhite.css b/helpcontent2/source/auxiliary/sr/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/sr/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/sr/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sr/sbasic.cfg b/helpcontent2/source/auxiliary/sr/sbasic.cfg
index 13325f6514..8f4fe66391 100755..100644
--- a/helpcontent2/source/auxiliary/sr/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/sr/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sr/scalc.cfg b/helpcontent2/source/auxiliary/sr/scalc.cfg
index 34175a09bd..df87fd28f7 100755..100644
--- a/helpcontent2/source/auxiliary/sr/scalc.cfg
+++ b/helpcontent2/source/auxiliary/sr/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sr/schart.cfg b/helpcontent2/source/auxiliary/sr/schart.cfg
index 2fa33afa0f..69f25f5036 100755..100644
--- a/helpcontent2/source/auxiliary/sr/schart.cfg
+++ b/helpcontent2/source/auxiliary/sr/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/sr/sdatabase.cfg b/helpcontent2/source/auxiliary/sr/sdatabase.cfg
index b005fbe5f5..9314933b59 100644
--- a/helpcontent2/source/auxiliary/sr/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/sr/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sr/sdraw.cfg b/helpcontent2/source/auxiliary/sr/sdraw.cfg
index bc1c668c6f..78f5a67313 100755..100644
--- a/helpcontent2/source/auxiliary/sr/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/sr/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sr/simpress.cfg b/helpcontent2/source/auxiliary/sr/simpress.cfg
index 5787f7c0c0..b117259da2 100755..100644
--- a/helpcontent2/source/auxiliary/sr/simpress.cfg
+++ b/helpcontent2/source/auxiliary/sr/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sr/smath.cfg b/helpcontent2/source/auxiliary/sr/smath.cfg
index df53035558..8fa2ef366b 100755..100644
--- a/helpcontent2/source/auxiliary/sr/smath.cfg
+++ b/helpcontent2/source/auxiliary/sr/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sr/swriter.cfg b/helpcontent2/source/auxiliary/sr/swriter.cfg
index efec83542f..ed301e5f39 100755..100644
--- a/helpcontent2/source/auxiliary/sr/swriter.cfg
+++ b/helpcontent2/source/auxiliary/sr/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ss/default.css b/helpcontent2/source/auxiliary/ss/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/ss/default.css
+++ b/helpcontent2/source/auxiliary/ss/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/ss/highcontrast1.css b/helpcontent2/source/auxiliary/ss/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/ss/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/ss/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ss/highcontrast2.css b/helpcontent2/source/auxiliary/ss/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/ss/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/ss/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ss/highcontrastblack.css b/helpcontent2/source/auxiliary/ss/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/ss/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/ss/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ss/highcontrastwhite.css b/helpcontent2/source/auxiliary/ss/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/ss/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/ss/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ss/sbasic.cfg b/helpcontent2/source/auxiliary/ss/sbasic.cfg
index 1ca6f4e5b1..0665879f32 100644
--- a/helpcontent2/source/auxiliary/ss/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/ss/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ss/scalc.cfg b/helpcontent2/source/auxiliary/ss/scalc.cfg
index 205658eaee..863eb5aed3 100644
--- a/helpcontent2/source/auxiliary/ss/scalc.cfg
+++ b/helpcontent2/source/auxiliary/ss/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ss/schart.cfg b/helpcontent2/source/auxiliary/ss/schart.cfg
index 2f2fafac4b..d0a1df24e1 100644
--- a/helpcontent2/source/auxiliary/ss/schart.cfg
+++ b/helpcontent2/source/auxiliary/ss/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/ss/sdatabase.cfg b/helpcontent2/source/auxiliary/ss/sdatabase.cfg
index f04e1f985b..34d883a7de 100644
--- a/helpcontent2/source/auxiliary/ss/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/ss/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ss/sdraw.cfg b/helpcontent2/source/auxiliary/ss/sdraw.cfg
index 7859b0db76..6ba90930c3 100644
--- a/helpcontent2/source/auxiliary/ss/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/ss/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ss/simpress.cfg b/helpcontent2/source/auxiliary/ss/simpress.cfg
index 0b74e51c2f..9728448c12 100644
--- a/helpcontent2/source/auxiliary/ss/simpress.cfg
+++ b/helpcontent2/source/auxiliary/ss/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ss/smath.cfg b/helpcontent2/source/auxiliary/ss/smath.cfg
index a642aee4f6..1f1084c675 100644
--- a/helpcontent2/source/auxiliary/ss/smath.cfg
+++ b/helpcontent2/source/auxiliary/ss/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ss/swriter.cfg b/helpcontent2/source/auxiliary/ss/swriter.cfg
index 5f95eac414..75ebd5827f 100644
--- a/helpcontent2/source/auxiliary/ss/swriter.cfg
+++ b/helpcontent2/source/auxiliary/ss/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/st/default.css b/helpcontent2/source/auxiliary/st/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/st/default.css
+++ b/helpcontent2/source/auxiliary/st/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/st/highcontrast1.css b/helpcontent2/source/auxiliary/st/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/st/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/st/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/st/highcontrast2.css b/helpcontent2/source/auxiliary/st/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/st/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/st/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/st/highcontrastblack.css b/helpcontent2/source/auxiliary/st/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/st/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/st/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/st/highcontrastwhite.css b/helpcontent2/source/auxiliary/st/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/st/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/st/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/st/sbasic.cfg b/helpcontent2/source/auxiliary/st/sbasic.cfg
index 7f5a4eb804..83c505737d 100755..100644
--- a/helpcontent2/source/auxiliary/st/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/st/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/st/scalc.cfg b/helpcontent2/source/auxiliary/st/scalc.cfg
index 12d96d7711..f924c47dc6 100755..100644
--- a/helpcontent2/source/auxiliary/st/scalc.cfg
+++ b/helpcontent2/source/auxiliary/st/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/st/schart.cfg b/helpcontent2/source/auxiliary/st/schart.cfg
index 2d90c7bc91..396cbf9b55 100755..100644
--- a/helpcontent2/source/auxiliary/st/schart.cfg
+++ b/helpcontent2/source/auxiliary/st/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/st/sdatabase.cfg b/helpcontent2/source/auxiliary/st/sdatabase.cfg
index 03e7c0f8cd..7bb9bcc359 100644
--- a/helpcontent2/source/auxiliary/st/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/st/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/st/sdraw.cfg b/helpcontent2/source/auxiliary/st/sdraw.cfg
index 5db26e0962..a235164026 100755..100644
--- a/helpcontent2/source/auxiliary/st/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/st/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/st/simpress.cfg b/helpcontent2/source/auxiliary/st/simpress.cfg
index 37889f5c00..243f46e002 100755..100644
--- a/helpcontent2/source/auxiliary/st/simpress.cfg
+++ b/helpcontent2/source/auxiliary/st/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/st/smath.cfg b/helpcontent2/source/auxiliary/st/smath.cfg
index 0b201427ca..a0328d291c 100755..100644
--- a/helpcontent2/source/auxiliary/st/smath.cfg
+++ b/helpcontent2/source/auxiliary/st/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/st/swriter.cfg b/helpcontent2/source/auxiliary/st/swriter.cfg
index 640571f17c..e7169b11d3 100755..100644
--- a/helpcontent2/source/auxiliary/st/swriter.cfg
+++ b/helpcontent2/source/auxiliary/st/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sv/default.css b/helpcontent2/source/auxiliary/sv/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/sv/default.css
+++ b/helpcontent2/source/auxiliary/sv/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/sv/highcontrast1.css b/helpcontent2/source/auxiliary/sv/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/sv/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/sv/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sv/highcontrast2.css b/helpcontent2/source/auxiliary/sv/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/sv/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/sv/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sv/highcontrastblack.css b/helpcontent2/source/auxiliary/sv/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/sv/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/sv/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sv/highcontrastwhite.css b/helpcontent2/source/auxiliary/sv/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/sv/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/sv/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sv/sbasic.cfg b/helpcontent2/source/auxiliary/sv/sbasic.cfg
index 04123b4687..ca96af5210 100755..100644
--- a/helpcontent2/source/auxiliary/sv/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/sv/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sv/scalc.cfg b/helpcontent2/source/auxiliary/sv/scalc.cfg
index 55ea0f6928..f5518f8ea5 100755..100644
--- a/helpcontent2/source/auxiliary/sv/scalc.cfg
+++ b/helpcontent2/source/auxiliary/sv/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sv/schart.cfg b/helpcontent2/source/auxiliary/sv/schart.cfg
index 621e5ef01a..00cb231b3f 100755..100644
--- a/helpcontent2/source/auxiliary/sv/schart.cfg
+++ b/helpcontent2/source/auxiliary/sv/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/sv/sdatabase.cfg b/helpcontent2/source/auxiliary/sv/sdatabase.cfg
index 4a254a9785..016853c99b 100644
--- a/helpcontent2/source/auxiliary/sv/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/sv/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sv/sdraw.cfg b/helpcontent2/source/auxiliary/sv/sdraw.cfg
index cb74975a0f..54ac7d59cb 100755..100644
--- a/helpcontent2/source/auxiliary/sv/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/sv/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sv/simpress.cfg b/helpcontent2/source/auxiliary/sv/simpress.cfg
index 32e0364f1f..8fce723e05 100755..100644
--- a/helpcontent2/source/auxiliary/sv/simpress.cfg
+++ b/helpcontent2/source/auxiliary/sv/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sv/smath.cfg b/helpcontent2/source/auxiliary/sv/smath.cfg
index 176cbfe213..3d521a7057 100755..100644
--- a/helpcontent2/source/auxiliary/sv/smath.cfg
+++ b/helpcontent2/source/auxiliary/sv/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sv/swriter.cfg b/helpcontent2/source/auxiliary/sv/swriter.cfg
index da3762bc9a..ff0adcd6e3 100755..100644
--- a/helpcontent2/source/auxiliary/sv/swriter.cfg
+++ b/helpcontent2/source/auxiliary/sv/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sw-TZ/default.css b/helpcontent2/source/auxiliary/sw-TZ/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/sw-TZ/default.css
+++ b/helpcontent2/source/auxiliary/sw-TZ/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/sw-TZ/highcontrast1.css b/helpcontent2/source/auxiliary/sw-TZ/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/sw-TZ/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/sw-TZ/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sw-TZ/highcontrast2.css b/helpcontent2/source/auxiliary/sw-TZ/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/sw-TZ/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/sw-TZ/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sw-TZ/highcontrastblack.css b/helpcontent2/source/auxiliary/sw-TZ/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/sw-TZ/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/sw-TZ/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sw-TZ/highcontrastwhite.css b/helpcontent2/source/auxiliary/sw-TZ/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/sw-TZ/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/sw-TZ/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/sw-TZ/sbasic.cfg b/helpcontent2/source/auxiliary/sw-TZ/sbasic.cfg
index 9073b11359..f4f070dbd0 100755..100644
--- a/helpcontent2/source/auxiliary/sw-TZ/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/sw-TZ/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sw-TZ/scalc.cfg b/helpcontent2/source/auxiliary/sw-TZ/scalc.cfg
index 402fde2c7c..85118b6bbf 100755..100644
--- a/helpcontent2/source/auxiliary/sw-TZ/scalc.cfg
+++ b/helpcontent2/source/auxiliary/sw-TZ/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sw-TZ/schart.cfg b/helpcontent2/source/auxiliary/sw-TZ/schart.cfg
index ba49e56573..2c42a8cc4c 100755..100644
--- a/helpcontent2/source/auxiliary/sw-TZ/schart.cfg
+++ b/helpcontent2/source/auxiliary/sw-TZ/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/sw-TZ/sdatabase.cfg b/helpcontent2/source/auxiliary/sw-TZ/sdatabase.cfg
index 8f6ad3d9cf..e1a5e55381 100644
--- a/helpcontent2/source/auxiliary/sw-TZ/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/sw-TZ/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sw-TZ/sdraw.cfg b/helpcontent2/source/auxiliary/sw-TZ/sdraw.cfg
index d9ca9ce16e..3653aa31d1 100755..100644
--- a/helpcontent2/source/auxiliary/sw-TZ/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/sw-TZ/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sw-TZ/simpress.cfg b/helpcontent2/source/auxiliary/sw-TZ/simpress.cfg
index 6195edd261..3fa76e218e 100755..100644
--- a/helpcontent2/source/auxiliary/sw-TZ/simpress.cfg
+++ b/helpcontent2/source/auxiliary/sw-TZ/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sw-TZ/smath.cfg b/helpcontent2/source/auxiliary/sw-TZ/smath.cfg
index d125ee86a9..df1c06b9b3 100755..100644
--- a/helpcontent2/source/auxiliary/sw-TZ/smath.cfg
+++ b/helpcontent2/source/auxiliary/sw-TZ/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/sw-TZ/swriter.cfg b/helpcontent2/source/auxiliary/sw-TZ/swriter.cfg
index fe419626a1..82694c3da4 100755..100644
--- a/helpcontent2/source/auxiliary/sw-TZ/swriter.cfg
+++ b/helpcontent2/source/auxiliary/sw-TZ/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/swriter.tree b/helpcontent2/source/auxiliary/swriter.tree
index b0435240f0..1fd0cff912 100755..100644
--- a/helpcontent2/source/auxiliary/swriter.tree
+++ b/helpcontent2/source/auxiliary/swriter.tree
@@ -36,7 +36,6 @@
 <topic id="swriter/text/swriter/main0216.xhp">OLE-Object Bar</topic>
 <topic id="swriter/text/swriter/main0220.xhp">Text Object Bar</topic>
 <topic id="shared/text/shared/main0201.xhp">Standard Bar</topic>
-<topic id="shared/text/shared/main0209.xhp">Hyperlink Bar</topic>
 <topic id="shared/text/shared/main0212.xhp">Table Data Bar</topic>
 <topic id="shared/text/shared/main0213.xhp">Form Navigation Bar</topic>
 <topic id="shared/text/shared/main0214.xhp">Query Design Bar</topic>
@@ -162,7 +161,6 @@
 <topic id="swriter/text/swriter/guide/auto_off.xhp">Turning Off AutoFormat and AutoCorrect</topic>
 <topic id="swriter/text/swriter/guide/auto_spellcheck.xhp">Automatically Check Spelling</topic>
 <topic id="swriter/text/swriter/guide/number_date_conv.xhp">Turning Number Recognition On or Off in Tables</topic>
-<topic id="swriter/text/swriter/guide/select_language.xhp">Checking Spelling in Other Languages</topic>
 <topic id="swriter/text/swriter/guide/using_hyphen.xhp">Hyphenation</topic>
 		</node>
 		<node id="0215" title="Numbering and Lists">
@@ -182,7 +180,6 @@
 <topic id="swriter/text/swriter/guide/auto_spellcheck.xhp">Automatically Check Spelling</topic>
 <topic id="swriter/text/swriter/guide/delete_from_dict.xhp">Removing Words From a User-Defined Dictionary</topic>
 <topic id="swriter/text/swriter/guide/using_thesaurus.xhp">Thesaurus</topic>
-<topic id="swriter/text/swriter/guide/select_language.xhp">Checking Spelling in Other Languages</topic>
 <topic id="swriter/text/swriter/guide/spellcheck_dialog.xhp">Checking Spelling Manually</topic>
 		</node>
 		<node id="0218" title="Troubleshooting Tips">
diff --git a/helpcontent2/source/auxiliary/ta/default.css b/helpcontent2/source/auxiliary/ta/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/ta/default.css
+++ b/helpcontent2/source/auxiliary/ta/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/ta/highcontrast1.css b/helpcontent2/source/auxiliary/ta/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/ta/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/ta/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ta/highcontrast2.css b/helpcontent2/source/auxiliary/ta/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/ta/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/ta/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ta/highcontrastblack.css b/helpcontent2/source/auxiliary/ta/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/ta/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/ta/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ta/highcontrastwhite.css b/helpcontent2/source/auxiliary/ta/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/ta/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/ta/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ta/sbasic.cfg b/helpcontent2/source/auxiliary/ta/sbasic.cfg
index 3a5ec65879..7936978958 100755..100644
--- a/helpcontent2/source/auxiliary/ta/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/ta/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ta/scalc.cfg b/helpcontent2/source/auxiliary/ta/scalc.cfg
index 6726fb01c0..177a192b23 100755..100644
--- a/helpcontent2/source/auxiliary/ta/scalc.cfg
+++ b/helpcontent2/source/auxiliary/ta/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ta/schart.cfg b/helpcontent2/source/auxiliary/ta/schart.cfg
index 78ab3a21e3..f6818ac505 100755..100644
--- a/helpcontent2/source/auxiliary/ta/schart.cfg
+++ b/helpcontent2/source/auxiliary/ta/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/ta/sdatabase.cfg b/helpcontent2/source/auxiliary/ta/sdatabase.cfg
index 9dba24f9aa..fc022588f7 100644
--- a/helpcontent2/source/auxiliary/ta/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/ta/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ta/sdraw.cfg b/helpcontent2/source/auxiliary/ta/sdraw.cfg
index 9dfca1b834..a034988a76 100755..100644
--- a/helpcontent2/source/auxiliary/ta/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/ta/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ta/simpress.cfg b/helpcontent2/source/auxiliary/ta/simpress.cfg
index 737ad5ce4f..bdcd707281 100755..100644
--- a/helpcontent2/source/auxiliary/ta/simpress.cfg
+++ b/helpcontent2/source/auxiliary/ta/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ta/smath.cfg b/helpcontent2/source/auxiliary/ta/smath.cfg
index 7e7c649633..aa713db5f5 100755..100644
--- a/helpcontent2/source/auxiliary/ta/smath.cfg
+++ b/helpcontent2/source/auxiliary/ta/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ta/swriter.cfg b/helpcontent2/source/auxiliary/ta/swriter.cfg
index a0d26fc7c3..0dccc865d9 100755..100644
--- a/helpcontent2/source/auxiliary/ta/swriter.cfg
+++ b/helpcontent2/source/auxiliary/ta/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/te/default.css b/helpcontent2/source/auxiliary/te/default.css
new file mode 100644
index 0000000000..bcdc5f4e61
--- /dev/null
+++ b/helpcontent2/source/auxiliary/te/default.css
@@ -0,0 +1,73 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                          DEFAULT STYLESHEET                       +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold; }
+
+.related
+	{ font-weight: bold; margin-top:20pt; border-top: 1px solid black;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; border: 1px solid #999999; background: #FFFFFF; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; margin-top: 2px; margin-bottom: 2px;}
+
+h1
+	{ font-size: 18pt; border-bottom: 1px solid black; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.howtoget
+	{ background:#EEEEEE;}
+
+.howtogetbody
+	{ background:#EEEEEE; margin: 0px;}
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+.debug
+	{ border: 1px solid black; padding: 3px; display: none;}
diff --git a/helpcontent2/source/auxiliary/te/highcontrast1.css b/helpcontent2/source/auxiliary/te/highcontrast1.css
new file mode 100644
index 0000000000..1b44518acd
--- /dev/null
+++ b/helpcontent2/source/auxiliary/te/highcontrast1.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #1 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFF00;}
+
+.related 
+	{ border-top: 1px solid #FFFF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/te/highcontrast2.css b/helpcontent2/source/auxiliary/te/highcontrast2.css
new file mode 100644
index 0000000000..6f934a4196
--- /dev/null
+++ b/helpcontent2/source/auxiliary/te/highcontrast2.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #2 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #00FF00;}
+
+.related 
+	{ border-top: 1px solid #00FF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #00FF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #00FF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/te/highcontrastblack.css b/helpcontent2/source/auxiliary/te/highcontrastblack.css
new file mode 100644
index 0000000000..87c4b7e310
--- /dev/null
+++ b/helpcontent2/source/auxiliary/te/highcontrastblack.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST BLACK STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFFFF;}
+
+.related 
+	{ border-top: 1px solid #FFFFFF; }
+
+.howtogetheader
+	{border: 1px solid #FFFFFF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFFFF; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFFFF; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/te/highcontrastwhite.css b/helpcontent2/source/auxiliary/te/highcontrastwhite.css
new file mode 100644
index 0000000000..9c8bbe469e
--- /dev/null
+++ b/helpcontent2/source/auxiliary/te/highcontrastwhite.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST WHITE STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #FFFFFF; color: #000000;}
+
+.related 
+	{ border-top: 1px solid #000000; }
+
+.howtogetheader
+	{border: 1px solid #000000; background: #FFFFFF;}
+
+h1 
+	{ border-bottom: 1px solid #000000; ]
+
+.howtoget
+	{ background:#FFFFFF;}
+
+.howtogetbody
+	{ background:#FFFFFF;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #000000; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/te/sbasic.cfg b/helpcontent2/source/auxiliary/te/sbasic.cfg
new file mode 100644
index 0000000000..1003dbeeb1
--- /dev/null
+++ b/helpcontent2/source/auxiliary/te/sbasic.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Basic
+
+Language=te
+Order=7
+Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
+Heading=headingheading
+Program=BASIC 
diff --git a/helpcontent2/source/auxiliary/te/scalc.cfg b/helpcontent2/source/auxiliary/te/scalc.cfg
new file mode 100644
index 0000000000..49cafd6971
--- /dev/null
+++ b/helpcontent2/source/auxiliary/te/scalc.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Calc
+
+Language=te
+Order=3
+Start=text%2Fscalc%2Fmain0000.xhp
+Heading=headingheading
+Program=CALC
diff --git a/helpcontent2/source/auxiliary/te/schart.cfg b/helpcontent2/source/auxiliary/te/schart.cfg
new file mode 100644
index 0000000000..efe0e8532f
--- /dev/null
+++ b/helpcontent2/source/auxiliary/te/schart.cfg
@@ -0,0 +1,8 @@
+Title=%PRODUCTNAME Chart
+
+Language=te
+Order=4
+Start=text%2Fschart%2Fmain0000.xhp
+Heading=headingheading
+Program=CHART
+
diff --git a/helpcontent2/source/auxiliary/te/sdatabase.cfg b/helpcontent2/source/auxiliary/te/sdatabase.cfg
new file mode 100644
index 0000000000..d0380e33cb
--- /dev/null
+++ b/helpcontent2/source/auxiliary/te/sdatabase.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Base
+
+Language=te
+Order=7
+Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
+Heading=headingheading
+Program=DATABASE 
diff --git a/helpcontent2/source/auxiliary/te/sdraw.cfg b/helpcontent2/source/auxiliary/te/sdraw.cfg
new file mode 100644
index 0000000000..772d971f6d
--- /dev/null
+++ b/helpcontent2/source/auxiliary/te/sdraw.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Draw
+
+Language=te
+Order=4
+Start=text%2Fsdraw%2Fmain0000.xhp
+Heading=headingheading
+Program=DRAW
diff --git a/helpcontent2/source/auxiliary/te/simpress.cfg b/helpcontent2/source/auxiliary/te/simpress.cfg
new file mode 100644
index 0000000000..a9fcde361f
--- /dev/null
+++ b/helpcontent2/source/auxiliary/te/simpress.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Impress
+
+Language=te
+Order=5
+Start=text%2Fsimpress%2Fmain0000.xhp
+Heading=headingheading
+Program=IMPRESS
diff --git a/helpcontent2/source/auxiliary/te/smath.cfg b/helpcontent2/source/auxiliary/te/smath.cfg
new file mode 100644
index 0000000000..ef8ef7aabe
--- /dev/null
+++ b/helpcontent2/source/auxiliary/te/smath.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Math
+
+Language=te
+Order=6
+Start=text%2Fsmath%2Fmain0000.xhp
+Heading=headingheading
+Program=MATH
diff --git a/helpcontent2/source/auxiliary/te/swriter.cfg b/helpcontent2/source/auxiliary/te/swriter.cfg
new file mode 100644
index 0000000000..4fe0270c9f
--- /dev/null
+++ b/helpcontent2/source/auxiliary/te/swriter.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Writer
+
+Language=te
+Order=2
+Start=text%2Fswriter%2Fmain0000.xhp
+Heading=headingheading
+Program=WRITER
diff --git a/helpcontent2/source/auxiliary/tg/default.css b/helpcontent2/source/auxiliary/tg/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/tg/default.css
+++ b/helpcontent2/source/auxiliary/tg/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/tg/highcontrast1.css b/helpcontent2/source/auxiliary/tg/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/tg/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/tg/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/tg/highcontrast2.css b/helpcontent2/source/auxiliary/tg/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/tg/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/tg/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/tg/highcontrastblack.css b/helpcontent2/source/auxiliary/tg/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/tg/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/tg/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/tg/highcontrastwhite.css b/helpcontent2/source/auxiliary/tg/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/tg/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/tg/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/tg/sbasic.cfg b/helpcontent2/source/auxiliary/tg/sbasic.cfg
index f4659fa7a9..d091e5e723 100755..100644
--- a/helpcontent2/source/auxiliary/tg/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/tg/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/tg/scalc.cfg b/helpcontent2/source/auxiliary/tg/scalc.cfg
index 2d513b7e09..42228b80ea 100755..100644
--- a/helpcontent2/source/auxiliary/tg/scalc.cfg
+++ b/helpcontent2/source/auxiliary/tg/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/tg/schart.cfg b/helpcontent2/source/auxiliary/tg/schart.cfg
index f7b0346626..0f1ff185bd 100755..100644
--- a/helpcontent2/source/auxiliary/tg/schart.cfg
+++ b/helpcontent2/source/auxiliary/tg/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/tg/sdatabase.cfg b/helpcontent2/source/auxiliary/tg/sdatabase.cfg
index fd0467e22a..522315638f 100644
--- a/helpcontent2/source/auxiliary/tg/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/tg/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/tg/sdraw.cfg b/helpcontent2/source/auxiliary/tg/sdraw.cfg
index 4f2b06e92a..92c80033c0 100755..100644
--- a/helpcontent2/source/auxiliary/tg/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/tg/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/tg/simpress.cfg b/helpcontent2/source/auxiliary/tg/simpress.cfg
index adca3cc094..e60d4a3fbd 100755..100644
--- a/helpcontent2/source/auxiliary/tg/simpress.cfg
+++ b/helpcontent2/source/auxiliary/tg/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/tg/smath.cfg b/helpcontent2/source/auxiliary/tg/smath.cfg
index 44f09b509f..ee6e26d229 100755..100644
--- a/helpcontent2/source/auxiliary/tg/smath.cfg
+++ b/helpcontent2/source/auxiliary/tg/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/tg/swriter.cfg b/helpcontent2/source/auxiliary/tg/swriter.cfg
index c062f7285f..b8502ed5d7 100755..100644
--- a/helpcontent2/source/auxiliary/tg/swriter.cfg
+++ b/helpcontent2/source/auxiliary/tg/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/th/default.css b/helpcontent2/source/auxiliary/th/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/th/default.css
+++ b/helpcontent2/source/auxiliary/th/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/th/highcontrast1.css b/helpcontent2/source/auxiliary/th/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/th/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/th/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/th/highcontrast2.css b/helpcontent2/source/auxiliary/th/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/th/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/th/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/th/highcontrastblack.css b/helpcontent2/source/auxiliary/th/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/th/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/th/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/th/highcontrastwhite.css b/helpcontent2/source/auxiliary/th/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/th/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/th/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/th/sbasic.cfg b/helpcontent2/source/auxiliary/th/sbasic.cfg
index f575cc33ff..b13ca27395 100755..100644
--- a/helpcontent2/source/auxiliary/th/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/th/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/th/scalc.cfg b/helpcontent2/source/auxiliary/th/scalc.cfg
index 9f320f469d..15b2d95b1a 100755..100644
--- a/helpcontent2/source/auxiliary/th/scalc.cfg
+++ b/helpcontent2/source/auxiliary/th/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/th/schart.cfg b/helpcontent2/source/auxiliary/th/schart.cfg
index f0b39ca769..49cbcf74bd 100755..100644
--- a/helpcontent2/source/auxiliary/th/schart.cfg
+++ b/helpcontent2/source/auxiliary/th/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/th/sdatabase.cfg b/helpcontent2/source/auxiliary/th/sdatabase.cfg
index 57f4470e90..8a4b807059 100644
--- a/helpcontent2/source/auxiliary/th/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/th/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/th/sdraw.cfg b/helpcontent2/source/auxiliary/th/sdraw.cfg
index 7c40d62f9d..31a9b1c677 100755..100644
--- a/helpcontent2/source/auxiliary/th/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/th/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/th/simpress.cfg b/helpcontent2/source/auxiliary/th/simpress.cfg
index d82be3ec27..c18cf17ac3 100755..100644
--- a/helpcontent2/source/auxiliary/th/simpress.cfg
+++ b/helpcontent2/source/auxiliary/th/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/th/smath.cfg b/helpcontent2/source/auxiliary/th/smath.cfg
index e6ad3944bb..114e60bce3 100755..100644
--- a/helpcontent2/source/auxiliary/th/smath.cfg
+++ b/helpcontent2/source/auxiliary/th/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/th/swriter.cfg b/helpcontent2/source/auxiliary/th/swriter.cfg
index 1c39fc0a31..93a1eaabf2 100755..100644
--- a/helpcontent2/source/auxiliary/th/swriter.cfg
+++ b/helpcontent2/source/auxiliary/th/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/tn/default.css b/helpcontent2/source/auxiliary/tn/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/tn/default.css
+++ b/helpcontent2/source/auxiliary/tn/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/tn/highcontrast1.css b/helpcontent2/source/auxiliary/tn/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/tn/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/tn/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/tn/highcontrast2.css b/helpcontent2/source/auxiliary/tn/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/tn/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/tn/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/tn/highcontrastblack.css b/helpcontent2/source/auxiliary/tn/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/tn/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/tn/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/tn/highcontrastwhite.css b/helpcontent2/source/auxiliary/tn/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/tn/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/tn/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/tn/sbasic.cfg b/helpcontent2/source/auxiliary/tn/sbasic.cfg
index 154c4d8196..9e2115a4f3 100755..100644
--- a/helpcontent2/source/auxiliary/tn/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/tn/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/tn/scalc.cfg b/helpcontent2/source/auxiliary/tn/scalc.cfg
index 20374f9599..84d056d0fe 100755..100644
--- a/helpcontent2/source/auxiliary/tn/scalc.cfg
+++ b/helpcontent2/source/auxiliary/tn/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/tn/schart.cfg b/helpcontent2/source/auxiliary/tn/schart.cfg
index a174d0ecb8..1b15e97287 100755..100644
--- a/helpcontent2/source/auxiliary/tn/schart.cfg
+++ b/helpcontent2/source/auxiliary/tn/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/tn/sdatabase.cfg b/helpcontent2/source/auxiliary/tn/sdatabase.cfg
index bd4a6ae464..3686b2bddd 100644
--- a/helpcontent2/source/auxiliary/tn/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/tn/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/tn/sdraw.cfg b/helpcontent2/source/auxiliary/tn/sdraw.cfg
index dfeef8749b..93407ca8db 100755..100644
--- a/helpcontent2/source/auxiliary/tn/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/tn/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/tn/simpress.cfg b/helpcontent2/source/auxiliary/tn/simpress.cfg
index b940b12dd0..9085651671 100755..100644
--- a/helpcontent2/source/auxiliary/tn/simpress.cfg
+++ b/helpcontent2/source/auxiliary/tn/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/tn/smath.cfg b/helpcontent2/source/auxiliary/tn/smath.cfg
index 6427c605de..bd5944c80d 100755..100644
--- a/helpcontent2/source/auxiliary/tn/smath.cfg
+++ b/helpcontent2/source/auxiliary/tn/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/tn/swriter.cfg b/helpcontent2/source/auxiliary/tn/swriter.cfg
index 1ed566db21..705cd066ac 100755..100644
--- a/helpcontent2/source/auxiliary/tn/swriter.cfg
+++ b/helpcontent2/source/auxiliary/tn/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/tr/default.css b/helpcontent2/source/auxiliary/tr/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/tr/default.css
+++ b/helpcontent2/source/auxiliary/tr/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/tr/highcontrast1.css b/helpcontent2/source/auxiliary/tr/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/tr/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/tr/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/tr/highcontrast2.css b/helpcontent2/source/auxiliary/tr/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/tr/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/tr/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/tr/highcontrastblack.css b/helpcontent2/source/auxiliary/tr/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/tr/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/tr/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/tr/highcontrastwhite.css b/helpcontent2/source/auxiliary/tr/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/tr/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/tr/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/tr/sbasic.cfg b/helpcontent2/source/auxiliary/tr/sbasic.cfg
index 3c17639bd8..2a743f7333 100755..100644
--- a/helpcontent2/source/auxiliary/tr/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/tr/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/tr/scalc.cfg b/helpcontent2/source/auxiliary/tr/scalc.cfg
index e3ee5e3b50..cfba197f45 100755..100644
--- a/helpcontent2/source/auxiliary/tr/scalc.cfg
+++ b/helpcontent2/source/auxiliary/tr/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/tr/schart.cfg b/helpcontent2/source/auxiliary/tr/schart.cfg
index 13051a7c50..a3738d83e8 100755..100644
--- a/helpcontent2/source/auxiliary/tr/schart.cfg
+++ b/helpcontent2/source/auxiliary/tr/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/tr/sdatabase.cfg b/helpcontent2/source/auxiliary/tr/sdatabase.cfg
index 51a0b3acef..2579aeff2f 100644
--- a/helpcontent2/source/auxiliary/tr/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/tr/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/tr/sdraw.cfg b/helpcontent2/source/auxiliary/tr/sdraw.cfg
index 40e249bc16..aab5ef81a9 100755..100644
--- a/helpcontent2/source/auxiliary/tr/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/tr/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/tr/simpress.cfg b/helpcontent2/source/auxiliary/tr/simpress.cfg
index f97b068e0c..6000b28080 100755..100644
--- a/helpcontent2/source/auxiliary/tr/simpress.cfg
+++ b/helpcontent2/source/auxiliary/tr/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/tr/smath.cfg b/helpcontent2/source/auxiliary/tr/smath.cfg
index 211018911b..1a2eb99542 100755..100644
--- a/helpcontent2/source/auxiliary/tr/smath.cfg
+++ b/helpcontent2/source/auxiliary/tr/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/tr/swriter.cfg b/helpcontent2/source/auxiliary/tr/swriter.cfg
index f8064cde44..de3d652757 100755..100644
--- a/helpcontent2/source/auxiliary/tr/swriter.cfg
+++ b/helpcontent2/source/auxiliary/tr/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ts/default.css b/helpcontent2/source/auxiliary/ts/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/ts/default.css
+++ b/helpcontent2/source/auxiliary/ts/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/ts/highcontrast1.css b/helpcontent2/source/auxiliary/ts/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/ts/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/ts/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ts/highcontrast2.css b/helpcontent2/source/auxiliary/ts/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/ts/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/ts/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ts/highcontrastblack.css b/helpcontent2/source/auxiliary/ts/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/ts/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/ts/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ts/highcontrastwhite.css b/helpcontent2/source/auxiliary/ts/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/ts/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/ts/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ts/sbasic.cfg b/helpcontent2/source/auxiliary/ts/sbasic.cfg
index f660fa8507..254402d4a0 100755..100644
--- a/helpcontent2/source/auxiliary/ts/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/ts/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ts/scalc.cfg b/helpcontent2/source/auxiliary/ts/scalc.cfg
index 4ca80cd9f8..0dc6caf41e 100755..100644
--- a/helpcontent2/source/auxiliary/ts/scalc.cfg
+++ b/helpcontent2/source/auxiliary/ts/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ts/schart.cfg b/helpcontent2/source/auxiliary/ts/schart.cfg
index 37b0fe2fb5..6cf3f6b767 100755..100644
--- a/helpcontent2/source/auxiliary/ts/schart.cfg
+++ b/helpcontent2/source/auxiliary/ts/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/ts/sdatabase.cfg b/helpcontent2/source/auxiliary/ts/sdatabase.cfg
index da681ffa23..f40227d485 100644
--- a/helpcontent2/source/auxiliary/ts/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/ts/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ts/sdraw.cfg b/helpcontent2/source/auxiliary/ts/sdraw.cfg
index b5e26273de..e5cfa3775e 100755..100644
--- a/helpcontent2/source/auxiliary/ts/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/ts/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ts/simpress.cfg b/helpcontent2/source/auxiliary/ts/simpress.cfg
index ae3be23b08..788d864dd0 100755..100644
--- a/helpcontent2/source/auxiliary/ts/simpress.cfg
+++ b/helpcontent2/source/auxiliary/ts/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ts/smath.cfg b/helpcontent2/source/auxiliary/ts/smath.cfg
index 7ed67f6616..d1794179ac 100755..100644
--- a/helpcontent2/source/auxiliary/ts/smath.cfg
+++ b/helpcontent2/source/auxiliary/ts/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ts/swriter.cfg b/helpcontent2/source/auxiliary/ts/swriter.cfg
index 803d5637a2..791de792d3 100755..100644
--- a/helpcontent2/source/auxiliary/ts/swriter.cfg
+++ b/helpcontent2/source/auxiliary/ts/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ug/default.css b/helpcontent2/source/auxiliary/ug/default.css
new file mode 100644
index 0000000000..bcdc5f4e61
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ug/default.css
@@ -0,0 +1,73 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                          DEFAULT STYLESHEET                       +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold; }
+
+.related
+	{ font-weight: bold; margin-top:20pt; border-top: 1px solid black;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; border: 1px solid #999999; background: #FFFFFF; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; margin-top: 2px; margin-bottom: 2px;}
+
+h1
+	{ font-size: 18pt; border-bottom: 1px solid black; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.howtoget
+	{ background:#EEEEEE;}
+
+.howtogetbody
+	{ background:#EEEEEE; margin: 0px;}
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+.debug
+	{ border: 1px solid black; padding: 3px; display: none;}
diff --git a/helpcontent2/source/auxiliary/ug/highcontrast1.css b/helpcontent2/source/auxiliary/ug/highcontrast1.css
new file mode 100644
index 0000000000..1b44518acd
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ug/highcontrast1.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #1 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFF00;}
+
+.related 
+	{ border-top: 1px solid #FFFF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/ug/highcontrast2.css b/helpcontent2/source/auxiliary/ug/highcontrast2.css
new file mode 100644
index 0000000000..6f934a4196
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ug/highcontrast2.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                       HIGH CONTRAST #2 STYLESHEET                 +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #00FF00;}
+
+.related 
+	{ border-top: 1px solid #00FF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #00FF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #00FF00; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/ug/highcontrastblack.css b/helpcontent2/source/auxiliary/ug/highcontrastblack.css
new file mode 100644
index 0000000000..87c4b7e310
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ug/highcontrastblack.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST BLACK STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFFFF;}
+
+.related 
+	{ border-top: 1px solid #FFFFFF; }
+
+.howtogetheader
+	{border: 1px solid #FFFFFF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFFFF; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFFFF; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/ug/highcontrastwhite.css b/helpcontent2/source/auxiliary/ug/highcontrastwhite.css
new file mode 100644
index 0000000000..9c8bbe469e
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ug/highcontrastwhite.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST WHITE STYLESHEET               +
++                           WESTERN LANGUAGES                       +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold;}
+
+.related
+	{ font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}	
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #FFFFFF; color: #000000;}
+
+.related 
+	{ border-top: 1px solid #000000; }
+
+.howtogetheader
+	{border: 1px solid #000000; background: #FFFFFF;}
+
+h1 
+	{ border-bottom: 1px solid #000000; ]
+
+.howtoget
+	{ background:#FFFFFF;}
+
+.howtogetbody
+	{ background:#FFFFFF;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #000000; }
\ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/ug/sbasic.cfg b/helpcontent2/source/auxiliary/ug/sbasic.cfg
new file mode 100644
index 0000000000..e3cc1fd6f9
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ug/sbasic.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Basic
+
+Language=ug
+Order=7
+Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
+Heading=headingheading
+Program=BASIC 
diff --git a/helpcontent2/source/auxiliary/ug/scalc.cfg b/helpcontent2/source/auxiliary/ug/scalc.cfg
new file mode 100644
index 0000000000..d306a85292
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ug/scalc.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Calc
+
+Language=ug
+Order=3
+Start=text%2Fscalc%2Fmain0000.xhp
+Heading=headingheading
+Program=CALC
diff --git a/helpcontent2/source/auxiliary/ug/schart.cfg b/helpcontent2/source/auxiliary/ug/schart.cfg
new file mode 100644
index 0000000000..cfc6865e11
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ug/schart.cfg
@@ -0,0 +1,8 @@
+Title=%PRODUCTNAME Chart
+
+Language=ug
+Order=4
+Start=text%2Fschart%2Fmain0000.xhp
+Heading=headingheading
+Program=CHART
+
diff --git a/helpcontent2/source/auxiliary/ug/sdatabase.cfg b/helpcontent2/source/auxiliary/ug/sdatabase.cfg
new file mode 100644
index 0000000000..2873aff4bc
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ug/sdatabase.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Base
+
+Language=ug
+Order=7
+Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
+Heading=headingheading
+Program=DATABASE 
diff --git a/helpcontent2/source/auxiliary/ug/sdraw.cfg b/helpcontent2/source/auxiliary/ug/sdraw.cfg
new file mode 100644
index 0000000000..8db46a3b5a
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ug/sdraw.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Draw
+
+Language=ug
+Order=4
+Start=text%2Fsdraw%2Fmain0000.xhp
+Heading=headingheading
+Program=DRAW
diff --git a/helpcontent2/source/auxiliary/ug/simpress.cfg b/helpcontent2/source/auxiliary/ug/simpress.cfg
new file mode 100644
index 0000000000..c51886e9ee
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ug/simpress.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Impress
+
+Language=ug
+Order=5
+Start=text%2Fsimpress%2Fmain0000.xhp
+Heading=headingheading
+Program=IMPRESS
diff --git a/helpcontent2/source/auxiliary/ug/smath.cfg b/helpcontent2/source/auxiliary/ug/smath.cfg
new file mode 100644
index 0000000000..585f99f351
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ug/smath.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Math
+
+Language=ug
+Order=6
+Start=text%2Fsmath%2Fmain0000.xhp
+Heading=headingheading
+Program=MATH
diff --git a/helpcontent2/source/auxiliary/ug/swriter.cfg b/helpcontent2/source/auxiliary/ug/swriter.cfg
new file mode 100644
index 0000000000..fcfacad835
--- /dev/null
+++ b/helpcontent2/source/auxiliary/ug/swriter.cfg
@@ -0,0 +1,8 @@
+
+Title=%PRODUCTNAME Writer
+
+Language=ug
+Order=2
+Start=text%2Fswriter%2Fmain0000.xhp
+Heading=headingheading
+Program=WRITER
diff --git a/helpcontent2/source/auxiliary/uk/default.css b/helpcontent2/source/auxiliary/uk/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/uk/default.css
+++ b/helpcontent2/source/auxiliary/uk/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/uk/highcontrast1.css b/helpcontent2/source/auxiliary/uk/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/uk/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/uk/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/uk/highcontrast2.css b/helpcontent2/source/auxiliary/uk/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/uk/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/uk/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/uk/highcontrastblack.css b/helpcontent2/source/auxiliary/uk/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/uk/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/uk/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/uk/highcontrastwhite.css b/helpcontent2/source/auxiliary/uk/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/uk/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/uk/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/uk/sbasic.cfg b/helpcontent2/source/auxiliary/uk/sbasic.cfg
index 8fe2ebc450..48b87ca907 100755..100644
--- a/helpcontent2/source/auxiliary/uk/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/uk/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/uk/scalc.cfg b/helpcontent2/source/auxiliary/uk/scalc.cfg
index 7041c67e00..9c14fece4f 100755..100644
--- a/helpcontent2/source/auxiliary/uk/scalc.cfg
+++ b/helpcontent2/source/auxiliary/uk/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/uk/schart.cfg b/helpcontent2/source/auxiliary/uk/schart.cfg
index f335171b06..e713407946 100755..100644
--- a/helpcontent2/source/auxiliary/uk/schart.cfg
+++ b/helpcontent2/source/auxiliary/uk/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/uk/sdatabase.cfg b/helpcontent2/source/auxiliary/uk/sdatabase.cfg
index 91d9321607..2030181693 100644
--- a/helpcontent2/source/auxiliary/uk/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/uk/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/uk/sdraw.cfg b/helpcontent2/source/auxiliary/uk/sdraw.cfg
index 79661efbf7..468166a019 100755..100644
--- a/helpcontent2/source/auxiliary/uk/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/uk/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/uk/simpress.cfg b/helpcontent2/source/auxiliary/uk/simpress.cfg
index ca5df7eb34..f6d48e1691 100755..100644
--- a/helpcontent2/source/auxiliary/uk/simpress.cfg
+++ b/helpcontent2/source/auxiliary/uk/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/uk/smath.cfg b/helpcontent2/source/auxiliary/uk/smath.cfg
index f49519e858..5a4992a264 100755..100644
--- a/helpcontent2/source/auxiliary/uk/smath.cfg
+++ b/helpcontent2/source/auxiliary/uk/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/uk/swriter.cfg b/helpcontent2/source/auxiliary/uk/swriter.cfg
index 76bd23039d..e22b9340df 100755..100644
--- a/helpcontent2/source/auxiliary/uk/swriter.cfg
+++ b/helpcontent2/source/auxiliary/uk/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/uz/default.css b/helpcontent2/source/auxiliary/uz/default.css
index c5eb2b3d79..5c13c46d2a 100755..100644
--- a/helpcontent2/source/auxiliary/uz/default.css
+++ b/helpcontent2/source/auxiliary/uz/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "DejaVu Sans","Arial Unicode MS",Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI",Arial,"Lucida Sans Unicode",Tahoma; }
+	{ font-family: "DejaVu Sans","Arial Unicode MS","Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "DejaVu Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "DejaVu Sans Mono","Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/uz/highcontrast1.css b/helpcontent2/source/auxiliary/uz/highcontrast1.css
index e950bb19fc..c6d9ce6b84 100755..100644
--- a/helpcontent2/source/auxiliary/uz/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/uz/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "DejaVu Sans","Arial Unicode MS",Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI",Arial,"Lucida Sans Unicode",Tahoma; }
+	{ font-family: "DejaVu Sans","Arial Unicode MS","Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "DejaVu Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "DejaVu Sans Mono","Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/uz/highcontrast2.css b/helpcontent2/source/auxiliary/uz/highcontrast2.css
index 9d9e99906e..b6e6b3d0db 100755..100644
--- a/helpcontent2/source/auxiliary/uz/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/uz/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "DejaVu Sans","Arial Unicode MS",Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI",Arial,"Lucida Sans Unicode",Tahoma; }
+	{ font-family: "DejaVu Sans","Arial Unicode MS","Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "DejaVu Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "DejaVu Sans Mono","Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/uz/highcontrastblack.css b/helpcontent2/source/auxiliary/uz/highcontrastblack.css
index 47938ebeae..7892f432e8 100755..100644
--- a/helpcontent2/source/auxiliary/uz/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/uz/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "DejaVu Sans","Arial Unicode MS",Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI",Arial,"Lucida Sans Unicode",Tahoma; }
+	{ font-family: "DejaVu Sans","Arial Unicode MS","Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "DejaVu Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "DejaVu Sans Mono","Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/uz/highcontrastwhite.css b/helpcontent2/source/auxiliary/uz/highcontrastwhite.css
index 68cdfc3fe8..8b30674899 100755..100644
--- a/helpcontent2/source/auxiliary/uz/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/uz/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "DejaVu Sans","Arial Unicode MS",Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI",Arial,"Lucida Sans Unicode",Tahoma; }
+	{ font-family: "DejaVu Sans","Arial Unicode MS","Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "DejaVu Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "DejaVu Sans Mono","Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/uz/sbasic.cfg b/helpcontent2/source/auxiliary/uz/sbasic.cfg
index 2ba2500eae..8f414854aa 100755..100644
--- a/helpcontent2/source/auxiliary/uz/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/uz/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/uz/scalc.cfg b/helpcontent2/source/auxiliary/uz/scalc.cfg
index 610d4a3692..df009a4db8 100755..100644
--- a/helpcontent2/source/auxiliary/uz/scalc.cfg
+++ b/helpcontent2/source/auxiliary/uz/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/uz/schart.cfg b/helpcontent2/source/auxiliary/uz/schart.cfg
index e4c782278e..ffe1c6b3a1 100755..100644
--- a/helpcontent2/source/auxiliary/uz/schart.cfg
+++ b/helpcontent2/source/auxiliary/uz/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/uz/sdatabase.cfg b/helpcontent2/source/auxiliary/uz/sdatabase.cfg
index f79654c984..2e24cfb079 100644
--- a/helpcontent2/source/auxiliary/uz/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/uz/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/uz/sdraw.cfg b/helpcontent2/source/auxiliary/uz/sdraw.cfg
index fb49aa469d..f22a93815b 100755..100644
--- a/helpcontent2/source/auxiliary/uz/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/uz/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/uz/simpress.cfg b/helpcontent2/source/auxiliary/uz/simpress.cfg
index 66ba72cf78..2e1cb66d42 100755..100644
--- a/helpcontent2/source/auxiliary/uz/simpress.cfg
+++ b/helpcontent2/source/auxiliary/uz/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/uz/smath.cfg b/helpcontent2/source/auxiliary/uz/smath.cfg
index 39eed2eec3..d06c68cd19 100755..100644
--- a/helpcontent2/source/auxiliary/uz/smath.cfg
+++ b/helpcontent2/source/auxiliary/uz/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/uz/swriter.cfg b/helpcontent2/source/auxiliary/uz/swriter.cfg
index 8b71985b3a..7004697db3 100755..100644
--- a/helpcontent2/source/auxiliary/uz/swriter.cfg
+++ b/helpcontent2/source/auxiliary/uz/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ve/default.css b/helpcontent2/source/auxiliary/ve/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/ve/default.css
+++ b/helpcontent2/source/auxiliary/ve/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/ve/highcontrast1.css b/helpcontent2/source/auxiliary/ve/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/ve/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/ve/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ve/highcontrast2.css b/helpcontent2/source/auxiliary/ve/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/ve/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/ve/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ve/highcontrastblack.css b/helpcontent2/source/auxiliary/ve/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/ve/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/ve/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ve/highcontrastwhite.css b/helpcontent2/source/auxiliary/ve/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/ve/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/ve/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/ve/sbasic.cfg b/helpcontent2/source/auxiliary/ve/sbasic.cfg
index 9884f98385..c0a9af0279 100644
--- a/helpcontent2/source/auxiliary/ve/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/ve/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ve/scalc.cfg b/helpcontent2/source/auxiliary/ve/scalc.cfg
index a1b69413a2..862745f67c 100644
--- a/helpcontent2/source/auxiliary/ve/scalc.cfg
+++ b/helpcontent2/source/auxiliary/ve/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ve/schart.cfg b/helpcontent2/source/auxiliary/ve/schart.cfg
index e6a576ebf9..b507f7e64a 100644
--- a/helpcontent2/source/auxiliary/ve/schart.cfg
+++ b/helpcontent2/source/auxiliary/ve/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/ve/sdatabase.cfg b/helpcontent2/source/auxiliary/ve/sdatabase.cfg
index 6370495d40..402a207980 100644
--- a/helpcontent2/source/auxiliary/ve/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/ve/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ve/sdraw.cfg b/helpcontent2/source/auxiliary/ve/sdraw.cfg
index 5da0aee04f..6f9422df94 100644
--- a/helpcontent2/source/auxiliary/ve/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/ve/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ve/simpress.cfg b/helpcontent2/source/auxiliary/ve/simpress.cfg
index 1b35ce6417..8ca26ed2dc 100644
--- a/helpcontent2/source/auxiliary/ve/simpress.cfg
+++ b/helpcontent2/source/auxiliary/ve/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ve/smath.cfg b/helpcontent2/source/auxiliary/ve/smath.cfg
index 3ee6f4901d..0458d72196 100644
--- a/helpcontent2/source/auxiliary/ve/smath.cfg
+++ b/helpcontent2/source/auxiliary/ve/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/ve/swriter.cfg b/helpcontent2/source/auxiliary/ve/swriter.cfg
index e291a32aaf..2ccab9f036 100644
--- a/helpcontent2/source/auxiliary/ve/swriter.cfg
+++ b/helpcontent2/source/auxiliary/ve/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/vi/default.css b/helpcontent2/source/auxiliary/vi/default.css
index 8a15af3be6..ff034b2061 100755..100644
--- a/helpcontent2/source/auxiliary/vi/default.css
+++ b/helpcontent2/source/auxiliary/vi/default.css
@@ -29,10 +29,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Times New Roman","DejaVu Sans","Vn Nimbus Sans L","GentiumAlt Regular",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Thorndale AMT",Thorndale,"Times New Roman","Nimbus Roman No9 L","DejaVu Sans","Vn Nimbus Sans L","GentiumAlt Regular","Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Vn Nimbus Mono L","Free Monospaced",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Vn Nimbus Mono L","Free Monospaced","Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/vi/highcontrast1.css b/helpcontent2/source/auxiliary/vi/highcontrast1.css
index d2a06ea836..0ffc111f15 100755..100644
--- a/helpcontent2/source/auxiliary/vi/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/vi/highcontrast1.css
@@ -30,10 +30,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Times New Roman","DejaVu Sans","Vn Nimbus Sans L","GentiumAlt Regular",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Thorndale AMT",Thorndale,"Times New Roman","Nimbus Roman No9 L","DejaVu Sans","Vn Nimbus Sans L","GentiumAlt Regular","Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Vn Nimbus Mono L","Free Monospaced",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Vn Nimbus Mono L","Free Monospaced","Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/vi/highcontrast2.css b/helpcontent2/source/auxiliary/vi/highcontrast2.css
index db16162b7d..4a0e26c8f0 100755..100644
--- a/helpcontent2/source/auxiliary/vi/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/vi/highcontrast2.css
@@ -30,10 +30,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Times New Roman","DejaVu Sans","Vn Nimbus Sans L","GentiumAlt Regular",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Thorndale AMT",Thorndale,"Times New Roman","Nimbus Roman No9 L","DejaVu Sans","Vn Nimbus Sans L","GentiumAlt Regular","Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Vn Nimbus Mono L","Free Monospaced",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Vn Nimbus Mono L","Free Monospaced","Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/vi/highcontrastblack.css b/helpcontent2/source/auxiliary/vi/highcontrastblack.css
index 0656c1e870..9106c0d713 100755..100644
--- a/helpcontent2/source/auxiliary/vi/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/vi/highcontrastblack.css
@@ -30,10 +30,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Times New Roman","DejaVu Sans","Vn Nimbus Sans L","GentiumAlt Regular",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Thorndale AMT",Thorndale,"Times New Roman","Nimbus Roman No9 L","DejaVu Sans","Vn Nimbus Sans L","GentiumAlt Regular","Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Vn Nimbus Mono L","Free Monospaced",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Vn Nimbus Mono L","Free Monospaced","Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/vi/highcontrastwhite.css b/helpcontent2/source/auxiliary/vi/highcontrastwhite.css
index ceacab21e0..801ef5dbed 100755..100644
--- a/helpcontent2/source/auxiliary/vi/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/vi/highcontrastwhite.css
@@ -30,10 +30,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Times New Roman","DejaVu Sans","Vn Nimbus Sans L","GentiumAlt Regular",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Thorndale AMT",Thorndale,"Times New Roman","Nimbus Roman No9 L","DejaVu Sans","Vn Nimbus Sans L","GentiumAlt Regular","Albany AMT",Albany,Arial,"Nimbus Sans L",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Vn Nimbus Mono L","Free Monospaced",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Vn Nimbus Mono L","Free Monospaced","Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/vi/sbasic.cfg b/helpcontent2/source/auxiliary/vi/sbasic.cfg
index 8aa4092531..d5e5779932 100755..100644
--- a/helpcontent2/source/auxiliary/vi/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/vi/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/vi/scalc.cfg b/helpcontent2/source/auxiliary/vi/scalc.cfg
index e1bbf31cea..7eef6f63ce 100755..100644
--- a/helpcontent2/source/auxiliary/vi/scalc.cfg
+++ b/helpcontent2/source/auxiliary/vi/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/vi/schart.cfg b/helpcontent2/source/auxiliary/vi/schart.cfg
index 3c67547b35..a23e7fdb5e 100755..100644
--- a/helpcontent2/source/auxiliary/vi/schart.cfg
+++ b/helpcontent2/source/auxiliary/vi/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/vi/sdatabase.cfg b/helpcontent2/source/auxiliary/vi/sdatabase.cfg
index a34b179dbb..e4bb01c14f 100644
--- a/helpcontent2/source/auxiliary/vi/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/vi/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/vi/sdraw.cfg b/helpcontent2/source/auxiliary/vi/sdraw.cfg
index 4df7f2b1cd..0f5e519a55 100755..100644
--- a/helpcontent2/source/auxiliary/vi/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/vi/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/vi/simpress.cfg b/helpcontent2/source/auxiliary/vi/simpress.cfg
index 36cfd39fe6..6f0eb1ea31 100755..100644
--- a/helpcontent2/source/auxiliary/vi/simpress.cfg
+++ b/helpcontent2/source/auxiliary/vi/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/vi/smath.cfg b/helpcontent2/source/auxiliary/vi/smath.cfg
index 1d08de8692..d4e55795c5 100755..100644
--- a/helpcontent2/source/auxiliary/vi/smath.cfg
+++ b/helpcontent2/source/auxiliary/vi/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/vi/swriter.cfg b/helpcontent2/source/auxiliary/vi/swriter.cfg
index 280199d11a..1bba785727 100755..100644
--- a/helpcontent2/source/auxiliary/vi/swriter.cfg
+++ b/helpcontent2/source/auxiliary/vi/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/xh/default.css b/helpcontent2/source/auxiliary/xh/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/xh/default.css
+++ b/helpcontent2/source/auxiliary/xh/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/xh/highcontrast1.css b/helpcontent2/source/auxiliary/xh/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/xh/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/xh/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/xh/highcontrast2.css b/helpcontent2/source/auxiliary/xh/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/xh/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/xh/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/xh/highcontrastblack.css b/helpcontent2/source/auxiliary/xh/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/xh/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/xh/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/xh/highcontrastwhite.css b/helpcontent2/source/auxiliary/xh/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/xh/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/xh/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/xh/sbasic.cfg b/helpcontent2/source/auxiliary/xh/sbasic.cfg
index f581711f9d..31ac4be518 100755..100644
--- a/helpcontent2/source/auxiliary/xh/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/xh/sbasic.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Basic
 
-Language=en-US
+Language=xh
 Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/xh/scalc.cfg b/helpcontent2/source/auxiliary/xh/scalc.cfg
index d9d7962f2d..be9f424598 100755..100644
--- a/helpcontent2/source/auxiliary/xh/scalc.cfg
+++ b/helpcontent2/source/auxiliary/xh/scalc.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Calc
 
-Language=en-US
+Language=xh
 Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/xh/schart.cfg b/helpcontent2/source/auxiliary/xh/schart.cfg
index e93c9ab1bc..353c663028 100755..100644
--- a/helpcontent2/source/auxiliary/xh/schart.cfg
+++ b/helpcontent2/source/auxiliary/xh/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/xh/sdatabase.cfg b/helpcontent2/source/auxiliary/xh/sdatabase.cfg
index 859bbdce98..3d524b64c4 100644
--- a/helpcontent2/source/auxiliary/xh/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/xh/sdatabase.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Base
 
-Language=en-US
+Language=xh
 Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/xh/sdraw.cfg b/helpcontent2/source/auxiliary/xh/sdraw.cfg
index 81119c21af..c538b7e8f9 100755..100644
--- a/helpcontent2/source/auxiliary/xh/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/xh/sdraw.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Draw
 
-Language=en-US
+Language=xh
 Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/xh/simpress.cfg b/helpcontent2/source/auxiliary/xh/simpress.cfg
index 827da159a8..e735b791be 100755..100644
--- a/helpcontent2/source/auxiliary/xh/simpress.cfg
+++ b/helpcontent2/source/auxiliary/xh/simpress.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Impress
 
-Language=en-US
+Language=xh
 Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/xh/smath.cfg b/helpcontent2/source/auxiliary/xh/smath.cfg
index 53966b5f04..b4deedfa49 100755..100644
--- a/helpcontent2/source/auxiliary/xh/smath.cfg
+++ b/helpcontent2/source/auxiliary/xh/smath.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Math
 
-Language=en-US
+Language=xh
 Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/xh/swriter.cfg b/helpcontent2/source/auxiliary/xh/swriter.cfg
index 5d3baaaad3..dbbc3a91f6 100755..100644
--- a/helpcontent2/source/auxiliary/xh/swriter.cfg
+++ b/helpcontent2/source/auxiliary/xh/swriter.cfg
@@ -1,9 +1,8 @@
 
 Title=%PRODUCTNAME Writer
 
-Language=en-US
+Language=xh
 Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/zh-CN/default.css b/helpcontent2/source/auxiliary/zh-CN/default.css
index 6b22f67044..3ff353301e 100755..100644
--- a/helpcontent2/source/auxiliary/zh-CN/default.css
+++ b/helpcontent2/source/auxiliary/zh-CN/default.css
@@ -13,7 +13,7 @@ body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .ta
 	{ font-family:  方正宋体,"MSung Light SC",SimSun,FZSongYi,FZShuSong,NSimSun,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Song; }
 	
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: 方正宋体,"MSung Light SC",Cumberland,Courier New,Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: 方正宋体,"MSung Light SC","Cumberland AMT",Cumberland,Courier New,Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/zh-CN/highcontrast1.css b/helpcontent2/source/auxiliary/zh-CN/highcontrast1.css
index d2c90b6610..a85c53467e 100755..100644
--- a/helpcontent2/source/auxiliary/zh-CN/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/zh-CN/highcontrast1.css
@@ -13,7 +13,7 @@ body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .ta
 	{ font-family:  方正宋体,"MSung Light SC",SimSun,FZSongYi,FZShuSong,NSimSun,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Song; }
 	
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: 方正宋体,"MSung Light SC",Cumberland,Courier New,Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: 方正宋体,"MSung Light SC","Cumberland AMT",Cumberland,Courier New,Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/zh-CN/highcontrast2.css b/helpcontent2/source/auxiliary/zh-CN/highcontrast2.css
index cd0804b5c0..76f93b3d61 100755..100644
--- a/helpcontent2/source/auxiliary/zh-CN/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/zh-CN/highcontrast2.css
@@ -13,7 +13,7 @@ body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .ta
 	{ font-family:  方正宋体,"MSung Light SC",SimSun,FZSongYi,FZShuSong,NSimSun,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Song; }
 	
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: 方正宋体,"MSung Light SC",Cumberland,Courier New,Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: 方正宋体,"MSung Light SC","Cumberland AMT",Cumberland,Courier New,Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/zh-CN/highcontrastblack.css b/helpcontent2/source/auxiliary/zh-CN/highcontrastblack.css
index 2cf6866e0e..e5380eb2ff 100755..100644
--- a/helpcontent2/source/auxiliary/zh-CN/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/zh-CN/highcontrastblack.css
@@ -13,7 +13,7 @@ body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .ta
 	{ font-family:  方正宋体,"MSung Light SC",SimSun,FZSongYi,FZShuSong,NSimSun,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Song; }
 	
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: 方正宋体,"MSung Light SC",Cumberland,Courier New,Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: 方正宋体,"MSung Light SC","Cumberland AMT",Cumberland,Courier New,Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/zh-CN/highcontrastwhite.css b/helpcontent2/source/auxiliary/zh-CN/highcontrastwhite.css
index 5064279907..0576678adb 100755..100644
--- a/helpcontent2/source/auxiliary/zh-CN/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/zh-CN/highcontrastwhite.css
@@ -13,7 +13,7 @@ body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .ta
 	{ font-family:  方正宋体,"MSung Light SC",SimSun,FZSongYi,FZShuSong,NSimSun,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Song; }
 	
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: 方正宋体,"MSung Light SC",Cumberland,Courier New,Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: 方正宋体,"MSung Light SC","Cumberland AMT",Cumberland,Courier New,Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/zh-CN/sbasic.cfg b/helpcontent2/source/auxiliary/zh-CN/sbasic.cfg
index 01fa077a32..f150c24f52 100755..100644
--- a/helpcontent2/source/auxiliary/zh-CN/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/zh-CN/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/zh-CN/scalc.cfg b/helpcontent2/source/auxiliary/zh-CN/scalc.cfg
index 7de5eda5ce..aec39df0c9 100755..100644
--- a/helpcontent2/source/auxiliary/zh-CN/scalc.cfg
+++ b/helpcontent2/source/auxiliary/zh-CN/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/zh-CN/schart.cfg b/helpcontent2/source/auxiliary/zh-CN/schart.cfg
index 9524617bb7..bec9d0febc 100755..100644
--- a/helpcontent2/source/auxiliary/zh-CN/schart.cfg
+++ b/helpcontent2/source/auxiliary/zh-CN/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/zh-CN/sdatabase.cfg b/helpcontent2/source/auxiliary/zh-CN/sdatabase.cfg
index e4307de8dc..ba7a2b162f 100644
--- a/helpcontent2/source/auxiliary/zh-CN/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/zh-CN/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/zh-CN/sdraw.cfg b/helpcontent2/source/auxiliary/zh-CN/sdraw.cfg
index 9f22421b23..e0856fe7f7 100755..100644
--- a/helpcontent2/source/auxiliary/zh-CN/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/zh-CN/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/zh-CN/simpress.cfg b/helpcontent2/source/auxiliary/zh-CN/simpress.cfg
index b1dd3b05ec..388e4c5df3 100755..100644
--- a/helpcontent2/source/auxiliary/zh-CN/simpress.cfg
+++ b/helpcontent2/source/auxiliary/zh-CN/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/zh-CN/smath.cfg b/helpcontent2/source/auxiliary/zh-CN/smath.cfg
index 375c906beb..57d6305b37 100755..100644
--- a/helpcontent2/source/auxiliary/zh-CN/smath.cfg
+++ b/helpcontent2/source/auxiliary/zh-CN/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/zh-CN/swriter.cfg b/helpcontent2/source/auxiliary/zh-CN/swriter.cfg
index 06e830939b..fbf24c511a 100755..100644
--- a/helpcontent2/source/auxiliary/zh-CN/swriter.cfg
+++ b/helpcontent2/source/auxiliary/zh-CN/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/zh-TW/default.css b/helpcontent2/source/auxiliary/zh-TW/default.css
index 9eefcd76a8..f996c00a4a 100755..100644
--- a/helpcontent2/source/auxiliary/zh-TW/default.css
+++ b/helpcontent2/source/auxiliary/zh-TW/default.css
@@ -13,7 +13,7 @@ body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .ta
 	{ font-family: 方正明體,MSung Light TC,MingLiU,Ming,PMingLiU,Andale Sans UI,Arial Unicode MS,Lucida Sans Unicode,Tahoma;}
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: 方正明體,MSung Light TC,Cumberland,Courier New,Courier,Lucida Sans Typewriter,Lucida Typewriter,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: 方正明體,MSung Light TC,"Cumberland AMT",Cumberland,Courier New,Courier,Lucida Sans Typewriter,Lucida Typewriter,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 
 .acronym 
diff --git a/helpcontent2/source/auxiliary/zh-TW/highcontrast1.css b/helpcontent2/source/auxiliary/zh-TW/highcontrast1.css
index 86916bc948..39d7b05a1f 100755..100644
--- a/helpcontent2/source/auxiliary/zh-TW/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/zh-TW/highcontrast1.css
@@ -13,7 +13,7 @@ body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .ta
 	{ font-family: 方正明體,MSung Light TC,MingLiU,Ming,PMingLiU,Andale Sans UI,Arial Unicode MS,Lucida Sans Unicode,Tahoma;}
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: 方正明體,MSung Light TC,Cumberland,Courier New,Courier,Lucida Sans Typewriter,Lucida Typewriter,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: 方正明體,MSung Light TC,"Cumberland AMT",Cumberland,Courier New,Courier,Lucida Sans Typewriter,Lucida Typewriter,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/zh-TW/highcontrast2.css b/helpcontent2/source/auxiliary/zh-TW/highcontrast2.css
index 59d3f78fa3..d587cd2687 100755..100644
--- a/helpcontent2/source/auxiliary/zh-TW/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/zh-TW/highcontrast2.css
@@ -13,7 +13,7 @@ body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .ta
 	{ font-family: 方正明體,MSung Light TC,MingLiU,Ming,PMingLiU,Andale Sans UI,Arial Unicode MS,Lucida Sans Unicode,Tahoma;}
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: 方正明體,MSung Light TC,Cumberland,Courier New,Courier,Lucida Sans Typewriter,Lucida Typewriter,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: 方正明體,MSung Light TC,"Cumberland AMT",Cumberland,Courier New,Courier,Lucida Sans Typewriter,Lucida Typewriter,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/zh-TW/highcontrastblack.css b/helpcontent2/source/auxiliary/zh-TW/highcontrastblack.css
index 61961ebffd..80678e888c 100755..100644
--- a/helpcontent2/source/auxiliary/zh-TW/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/zh-TW/highcontrastblack.css
@@ -13,7 +13,7 @@ body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .ta
 	{ font-family: 方正明體,MSung Light TC,MingLiU,Ming,PMingLiU,Andale Sans UI,Arial Unicode MS,Lucida Sans Unicode,Tahoma;}
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: 方正明體,MSung Light TC,Cumberland,Courier New,Courier,Lucida Sans Typewriter,Lucida Typewriter,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: 方正明體,MSung Light TC,"Cumberland AMT",Cumberland,Courier New,Courier,Lucida Sans Typewriter,Lucida Typewriter,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/zh-TW/highcontrastwhite.css b/helpcontent2/source/auxiliary/zh-TW/highcontrastwhite.css
index 2bd98c7a14..9fc9c2ae65 100755..100644
--- a/helpcontent2/source/auxiliary/zh-TW/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/zh-TW/highcontrastwhite.css
@@ -13,7 +13,7 @@ body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .ta
 	{ font-family: 方正明體,MSung Light TC,MingLiU,Ming,PMingLiU,Andale Sans UI,Arial Unicode MS,Lucida Sans Unicode,Tahoma;}
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: 方正明體,MSung Light TC,Cumberland,Courier New,Courier,Lucida Sans Typewriter,Lucida Typewriter,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: 方正明體,MSung Light TC,"Cumberland AMT",Cumberland,Courier New,Courier,Lucida Sans Typewriter,Lucida Typewriter,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/zh-TW/sbasic.cfg b/helpcontent2/source/auxiliary/zh-TW/sbasic.cfg
index ac28547d15..ebf4823837 100755..100644
--- a/helpcontent2/source/auxiliary/zh-TW/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/zh-TW/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/zh-TW/scalc.cfg b/helpcontent2/source/auxiliary/zh-TW/scalc.cfg
index 131fb0b15b..d354d3ebc0 100755..100644
--- a/helpcontent2/source/auxiliary/zh-TW/scalc.cfg
+++ b/helpcontent2/source/auxiliary/zh-TW/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/zh-TW/schart.cfg b/helpcontent2/source/auxiliary/zh-TW/schart.cfg
index eb633c9c42..f55fa28b49 100755..100644
--- a/helpcontent2/source/auxiliary/zh-TW/schart.cfg
+++ b/helpcontent2/source/auxiliary/zh-TW/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/zh-TW/sdatabase.cfg b/helpcontent2/source/auxiliary/zh-TW/sdatabase.cfg
index 810fbd0083..5f5b2a7eee 100644
--- a/helpcontent2/source/auxiliary/zh-TW/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/zh-TW/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/zh-TW/sdraw.cfg b/helpcontent2/source/auxiliary/zh-TW/sdraw.cfg
index ac1ec9756b..bf69972788 100755..100644
--- a/helpcontent2/source/auxiliary/zh-TW/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/zh-TW/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/zh-TW/simpress.cfg b/helpcontent2/source/auxiliary/zh-TW/simpress.cfg
index ce3775139a..4721f60a47 100755..100644
--- a/helpcontent2/source/auxiliary/zh-TW/simpress.cfg
+++ b/helpcontent2/source/auxiliary/zh-TW/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/zh-TW/smath.cfg b/helpcontent2/source/auxiliary/zh-TW/smath.cfg
index d9eaa7413a..44050f7c0c 100755..100644
--- a/helpcontent2/source/auxiliary/zh-TW/smath.cfg
+++ b/helpcontent2/source/auxiliary/zh-TW/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/zh-TW/swriter.cfg b/helpcontent2/source/auxiliary/zh-TW/swriter.cfg
index 4bb708ad0c..1aa67b6557 100755..100644
--- a/helpcontent2/source/auxiliary/zh-TW/swriter.cfg
+++ b/helpcontent2/source/auxiliary/zh-TW/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/zu/default.css b/helpcontent2/source/auxiliary/zu/default.css
index 2fa534688a..bcdc5f4e61 100755..100644
--- a/helpcontent2/source/auxiliary/zu/default.css
+++ b/helpcontent2/source/auxiliary/zu/default.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/zu/highcontrast1.css b/helpcontent2/source/auxiliary/zu/highcontrast1.css
index 354c383724..1b44518acd 100755..100644
--- a/helpcontent2/source/auxiliary/zu/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/zu/highcontrast1.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/zu/highcontrast2.css b/helpcontent2/source/auxiliary/zu/highcontrast2.css
index ec2763dc2b..6f934a4196 100755..100644
--- a/helpcontent2/source/auxiliary/zu/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/zu/highcontrast2.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/zu/highcontrastblack.css b/helpcontent2/source/auxiliary/zu/highcontrastblack.css
index e782fd491c..87c4b7e310 100755..100644
--- a/helpcontent2/source/auxiliary/zu/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/zu/highcontrastblack.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/zu/highcontrastwhite.css b/helpcontent2/source/auxiliary/zu/highcontrastwhite.css
index 95f552ea71..9c8bbe469e 100755..100644
--- a/helpcontent2/source/auxiliary/zu/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/zu/highcontrastwhite.css
@@ -10,10 +10,10 @@
 
 
 body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
-	{ font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+	{ font-family: "Albany AMT",Albany,Arial,"Nimbus Sans L","Bitstream Vera Sans",Helvetica,Lucida,Geneva,Helmet,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma,sans-serif; }
 
 .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
-	{ font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+	{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
 
 .acronym 
 	{ font-weight: bold;}
diff --git a/helpcontent2/source/auxiliary/zu/sbasic.cfg b/helpcontent2/source/auxiliary/zu/sbasic.cfg
index d7e50d258a..9a70737d94 100755..100644
--- a/helpcontent2/source/auxiliary/zu/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/zu/sbasic.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
 Heading=headingheading
 Program=BASIC 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/zu/scalc.cfg b/helpcontent2/source/auxiliary/zu/scalc.cfg
index 3341f30f75..008867cf2e 100755..100644
--- a/helpcontent2/source/auxiliary/zu/scalc.cfg
+++ b/helpcontent2/source/auxiliary/zu/scalc.cfg
@@ -6,4 +6,3 @@ Order=3
 Start=text%2Fscalc%2Fmain0000.xhp
 Heading=headingheading
 Program=CALC
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/zu/schart.cfg b/helpcontent2/source/auxiliary/zu/schart.cfg
index d891f6ef5b..406c5c512e 100755..100644
--- a/helpcontent2/source/auxiliary/zu/schart.cfg
+++ b/helpcontent2/source/auxiliary/zu/schart.cfg
@@ -5,5 +5,4 @@ Order=4
 Start=text%2Fschart%2Fmain0000.xhp
 Heading=headingheading
 Program=CHART
-07.07.04 00:00:00
 
diff --git a/helpcontent2/source/auxiliary/zu/sdatabase.cfg b/helpcontent2/source/auxiliary/zu/sdatabase.cfg
index 5e4b8ad195..f2f69f4e7e 100644
--- a/helpcontent2/source/auxiliary/zu/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/zu/sdatabase.cfg
@@ -6,4 +6,3 @@ Order=7
 Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
 Heading=headingheading
 Program=DATABASE 
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/zu/sdraw.cfg b/helpcontent2/source/auxiliary/zu/sdraw.cfg
index ecde72fbac..fec2f7d710 100755..100644
--- a/helpcontent2/source/auxiliary/zu/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/zu/sdraw.cfg
@@ -6,4 +6,3 @@ Order=4
 Start=text%2Fsdraw%2Fmain0000.xhp
 Heading=headingheading
 Program=DRAW
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/zu/simpress.cfg b/helpcontent2/source/auxiliary/zu/simpress.cfg
index 0ef5ff1317..e3c2b20f30 100755..100644
--- a/helpcontent2/source/auxiliary/zu/simpress.cfg
+++ b/helpcontent2/source/auxiliary/zu/simpress.cfg
@@ -6,4 +6,3 @@ Order=5
 Start=text%2Fsimpress%2Fmain0000.xhp
 Heading=headingheading
 Program=IMPRESS
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/zu/smath.cfg b/helpcontent2/source/auxiliary/zu/smath.cfg
index 1cbad71e30..01cb5f021f 100755..100644
--- a/helpcontent2/source/auxiliary/zu/smath.cfg
+++ b/helpcontent2/source/auxiliary/zu/smath.cfg
@@ -6,4 +6,3 @@ Order=6
 Start=text%2Fsmath%2Fmain0000.xhp
 Heading=headingheading
 Program=MATH
-07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/zu/swriter.cfg b/helpcontent2/source/auxiliary/zu/swriter.cfg
index a7db4436b9..04c4308f87 100755..100644
--- a/helpcontent2/source/auxiliary/zu/swriter.cfg
+++ b/helpcontent2/source/auxiliary/zu/swriter.cfg
@@ -6,4 +6,3 @@ Order=2
 Start=text%2Fswriter%2Fmain0000.xhp
 Heading=headingheading
 Program=WRITER
-07.07.04 00:00:00
diff --git a/helpcontent2/source/text/sbasic/guide/control_properties.xhp b/helpcontent2/source/text/sbasic/guide/control_properties.xhp
index daf0423632..daf0423632 100755..100644
--- a/helpcontent2/source/text/sbasic/guide/control_properties.xhp
+++ b/helpcontent2/source/text/sbasic/guide/control_properties.xhp
diff --git a/helpcontent2/source/text/sbasic/guide/create_dialog.xhp b/helpcontent2/source/text/sbasic/guide/create_dialog.xhp
index 3b007cfda9..3b007cfda9 100755..100644
--- a/helpcontent2/source/text/sbasic/guide/create_dialog.xhp
+++ b/helpcontent2/source/text/sbasic/guide/create_dialog.xhp
diff --git a/helpcontent2/source/text/sbasic/guide/insert_control.xhp b/helpcontent2/source/text/sbasic/guide/insert_control.xhp
index 58e0ccce9a..58e0ccce9a 100755..100644
--- a/helpcontent2/source/text/sbasic/guide/insert_control.xhp
+++ b/helpcontent2/source/text/sbasic/guide/insert_control.xhp
diff --git a/helpcontent2/source/text/sbasic/guide/show_dialog.xhp b/helpcontent2/source/text/sbasic/guide/show_dialog.xhp
index 131ac39702..131ac39702 100755..100644
--- a/helpcontent2/source/text/sbasic/guide/show_dialog.xhp
+++ b/helpcontent2/source/text/sbasic/guide/show_dialog.xhp
diff --git a/helpcontent2/source/text/sbasic/guide/translation.xhp b/helpcontent2/source/text/sbasic/guide/translation.xhp
index 9a1a47fc59..056b348bc7 100644
--- a/helpcontent2/source/text/sbasic/guide/translation.xhp
+++ b/helpcontent2/source/text/sbasic/guide/translation.xhp
@@ -63,7 +63,7 @@
 </listitem>
 <listitem>
 <paragraph role="paragraph" id="par_id7359233" xml-lang="en-US" l10n="NEW">Click the <emph>Manage Languages</emph> icon 
-<image id="img_id2526017" src="res/commandimagelist/sc_managelanguage.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id2526017" xml-lang="en-US">Manage Language icon</alt>
+<image id="img_id2526017" src="cmd/sc_managelanguage.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id2526017" xml-lang="en-US">Manage Language icon</alt>
 	</image> on the Language toolbar or on the Toolbox bar.</paragraph>
 <paragraph role="paragraph" id="par_id6549272" xml-lang="en-US" l10n="NEW">You see the Manage User Interface Language dialog. The dialog manages languages for the current library. The name of the current library is shown on the title bar.</paragraph>
 </listitem>
diff --git a/helpcontent2/source/text/sbasic/shared/00000002.xhp b/helpcontent2/source/text/sbasic/shared/00000002.xhp
index 832a5fe1c9..832a5fe1c9 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/00000002.xhp
+++ b/helpcontent2/source/text/sbasic/shared/00000002.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/00000003.xhp b/helpcontent2/source/text/sbasic/shared/00000003.xhp
index 26aea0e0ce..26aea0e0ce 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/00000003.xhp
+++ b/helpcontent2/source/text/sbasic/shared/00000003.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/01/06130100.xhp b/helpcontent2/source/text/sbasic/shared/01/06130100.xhp
index 03e8c94886..03e8c94886 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/01/06130100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01/06130100.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/01000000.xhp b/helpcontent2/source/text/sbasic/shared/01000000.xhp
index e9f738b09d..e9f738b09d 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/01000000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01000000.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/01010210.xhp b/helpcontent2/source/text/sbasic/shared/01010210.xhp
index 96c74a2b07..96c74a2b07 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/01010210.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01010210.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/01020000.xhp b/helpcontent2/source/text/sbasic/shared/01020000.xhp
index 4d279767c8..4d279767c8 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/01020000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01020000.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/01020200.xhp b/helpcontent2/source/text/sbasic/shared/01020200.xhp
index fe16a12953..bb05d13fba 100644
--- a/helpcontent2/source/text/sbasic/shared/01020200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01020200.xhp
@@ -47,7 +47,7 @@
 </section>
 <section id="object_catalog">
 <paragraph role="paragraph" id="par_id3147346" xml-lang="en-US" l10n="U" oldref="78">Click the <emph>Object Catalog</emph> icon 
-<image id="img_id3147341" src="res/commandimagelist/sc_objectcatalog.png" width="0.564cm" height="0.564cm"><alt id="alt_id3147341" xml-lang="en-US">Icon</alt>
+<image id="img_id3147341" src="cmd/sc_objectcatalog.png" width="0.564cm" height="0.564cm"><alt id="alt_id3147341" xml-lang="en-US">Icon</alt>
 	</image> in the Macro toolbar to display the object catalog.</paragraph>
 <paragraph role="paragraph" id="par_id3155114" xml-lang="en-US" l10n="U" oldref="79">The dialog shows a list of all existing objects in a hierarchical representation. Double-clicking a list entry opens its subordinate objects.</paragraph>
 <paragraph role="paragraph" id="par_id3150786" xml-lang="en-US" l10n="U" oldref="83">To display a certain module in the Editor or to position the cursor in a selected SUB or FUNCTION, select the corresponding entry and click the <emph>Show</emph> icon 
diff --git a/helpcontent2/source/text/sbasic/shared/01020500.xhp b/helpcontent2/source/text/sbasic/shared/01020500.xhp
index 20f63a63d5..20f63a63d5 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/01020500.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01020500.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/01030000.xhp b/helpcontent2/source/text/sbasic/shared/01030000.xhp
index d1e7029460..d1e7029460 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/01030000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01030000.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/01030300.xhp b/helpcontent2/source/text/sbasic/shared/01030300.xhp
index d4b837bea2..d4b837bea2 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/01030300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01030300.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/01030400.xhp b/helpcontent2/source/text/sbasic/shared/01030400.xhp
index e5511db637..e5511db637 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/01030400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01030400.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/01040000.xhp b/helpcontent2/source/text/sbasic/shared/01040000.xhp
index abc97dffa8..abc97dffa8 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/01040000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01040000.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/01170100.xhp b/helpcontent2/source/text/sbasic/shared/01170100.xhp
index e57e5ca761..e57e5ca761 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/01170100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01170100.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/01170103.xhp b/helpcontent2/source/text/sbasic/shared/01170103.xhp
index adbe5ca9a5..adbe5ca9a5 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/01170103.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01170103.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/02/11020000.xhp b/helpcontent2/source/text/sbasic/shared/02/11020000.xhp
index b36924208d..6d871f4cb9 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11020000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11020000.xhp
@@ -52,7 +52,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3156426" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_compilebasic.png" id="img_id3147576"><alt xml-lang="en-US" id="alt_id3147576">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3156426" xml-lang="en-US" oldref=""><image src="cmd/sc_compilebasic.png" id="img_id3147576"><alt xml-lang="en-US" id="alt_id3147576">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3149399" l10n="U" xml-lang="en-US" oldref="3">Compile</paragraph>
diff --git a/helpcontent2/source/text/sbasic/shared/02/11030000.xhp b/helpcontent2/source/text/sbasic/shared/02/11030000.xhp
index d7f68502c8..bbf46845ee 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11030000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11030000.xhp
@@ -51,7 +51,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="E">
-<image id="img_id3153311" src="res/commandimagelist/sc_runbasic.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153311" xml-lang="en-US">Icon</alt>
+<image id="img_id3153311" src="cmd/sc_runbasic.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153311" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/sbasic/shared/02/11040000.xhp b/helpcontent2/source/text/sbasic/shared/02/11040000.xhp
index 484bd34c3a..4955c1a9a7 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11040000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11040000.xhp
@@ -55,7 +55,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3146797" xml-lang="en-US" l10n="E">
-<image id="img_id3148538" src="res/commandimagelist/sc_stop.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148538" xml-lang="en-US">Icon</alt>
+<image id="img_id3148538" src="cmd/sc_stop.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148538" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/sbasic/shared/02/11050000.xhp b/helpcontent2/source/text/sbasic/shared/02/11050000.xhp
index 109af29ae5..60901db919 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11050000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11050000.xhp
@@ -54,7 +54,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3157958" xml-lang="en-US" l10n="E">
-<image id="img_id3153345" src="res/commandimagelist/sc_basicstepinto.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153345" xml-lang="en-US">Icon</alt>
+<image id="img_id3153345" src="cmd/sc_basicstepinto.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153345" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/sbasic/shared/02/11060000.xhp b/helpcontent2/source/text/sbasic/shared/02/11060000.xhp
index bc27016f98..e73f2aa63d 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11060000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11060000.xhp
@@ -54,7 +54,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3147576" xml-lang="en-US" l10n="E">
-<image id="img_id3143267" src="res/commandimagelist/sc_basicstepover.png" width="0.222inch" height="0.222inch"><alt id="alt_id3143267" xml-lang="en-US">Icon</alt>
+<image id="img_id3143267" src="cmd/sc_basicstepover.png" width="0.222inch" height="0.222inch"><alt id="alt_id3143267" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/sbasic/shared/02/11070000.xhp b/helpcontent2/source/text/sbasic/shared/02/11070000.xhp
index 08bd8d949b..af1abb8deb 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11070000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11070000.xhp
@@ -51,7 +51,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3156346" xml-lang="en-US" l10n="E">
-<image id="img_id3152780" src="res/commandimagelist/sc_togglebreakpoint.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3152780" xml-lang="en-US">Icon</alt>
+<image id="img_id3152780" src="cmd/sc_togglebreakpoint.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3152780" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/sbasic/shared/02/11080000.xhp b/helpcontent2/source/text/sbasic/shared/02/11080000.xhp
index 25896cbc50..66984f6451 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11080000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11080000.xhp
@@ -54,7 +54,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="E">
-<image id="img_id3147209" src="res/commandimagelist/sc_addwatch.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147209" xml-lang="en-US">Icon</alt>
+<image id="img_id3147209" src="cmd/sc_addwatch.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147209" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/sbasic/shared/02/11090000.xhp b/helpcontent2/source/text/sbasic/shared/02/11090000.xhp
index 21bb234d59..383bb6d60b 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11090000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11090000.xhp
@@ -54,7 +54,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3148538" xml-lang="en-US" l10n="E">
-<image id="img_id3163803" src="res/commandimagelist/sc_objectcatalog.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3163803" xml-lang="en-US">Icon</alt>
+<image id="img_id3163803" src="cmd/sc_objectcatalog.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3163803" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/sbasic/shared/02/11100000.xhp b/helpcontent2/source/text/sbasic/shared/02/11100000.xhp
index f01fa92071..6ce49c75a2 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11100000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11100000.xhp
@@ -52,7 +52,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3148538" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_choosemacro.png" id="img_id3153662"><alt xml-lang="en-US" id="alt_id3153662">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3148538" xml-lang="en-US" oldref=""><image src="cmd/sc_choosemacro.png" id="img_id3153662"><alt xml-lang="en-US" id="alt_id3153662">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3153542" l10n="U" xml-lang="en-US" oldref="3">Macros</paragraph>
diff --git a/helpcontent2/source/text/sbasic/shared/02/11110000.xhp b/helpcontent2/source/text/sbasic/shared/02/11110000.xhp
index 41b32f8594..c8262cbd13 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11110000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11110000.xhp
@@ -52,7 +52,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3157958" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_moduledialog.png" id="img_id3155535"><alt xml-lang="en-US" id="alt_id3155535">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3157958" xml-lang="en-US" oldref=""><image src="cmd/sc_moduledialog.png" id="img_id3155535"><alt xml-lang="en-US" id="alt_id3155535">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3145383" l10n="U" xml-lang="en-US" oldref="3">Modules</paragraph>
diff --git a/helpcontent2/source/text/sbasic/shared/02/11120000.xhp b/helpcontent2/source/text/sbasic/shared/02/11120000.xhp
index a1fb1c78b4..3d9b8f5583 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11120000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11120000.xhp
@@ -52,7 +52,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3149182" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_matchgroup.png" id="img_id3155892"><alt xml-lang="en-US" id="alt_id3155892">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3149182" xml-lang="en-US" oldref=""><image src="cmd/sc_matchgroup.png" id="img_id3155892"><alt xml-lang="en-US" id="alt_id3155892">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3147276" l10n="U" xml-lang="en-US" oldref="3">Find Parentheses</paragraph>
diff --git a/helpcontent2/source/text/sbasic/shared/02/11140000.xhp b/helpcontent2/source/text/sbasic/shared/02/11140000.xhp
index 743483cbca..b760f60095 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11140000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11140000.xhp
@@ -54,7 +54,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145136" xml-lang="en-US" l10n="E">
-<image id="img_id3147571" src="res/commandimagelist/sc_loadbasic.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3147571" xml-lang="en-US">Icon</alt>
+<image id="img_id3147571" src="cmd/sc_loadbasic.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3147571" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/sbasic/shared/02/11150000.xhp b/helpcontent2/source/text/sbasic/shared/02/11150000.xhp
index 7f5a828c0f..c98704486f 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11150000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11150000.xhp
@@ -53,7 +53,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145071" xml-lang="en-US" l10n="E">
-<image id="img_id3149182" src="res/commandimagelist/sc_savebasicas.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149182" xml-lang="en-US">Icon</alt>
+<image id="img_id3149182" src="cmd/sc_savebasicas.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149182" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/sbasic/shared/02/11160000.xhp b/helpcontent2/source/text/sbasic/shared/02/11160000.xhp
index aacf1883e1..83a718358a 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11160000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11160000.xhp
@@ -52,7 +52,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3156410" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_basicstepout.png" id="img_id3159233"><alt xml-lang="en-US" id="alt_id3159233">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3156410" xml-lang="en-US" oldref=""><image src="cmd/sc_basicstepout.png" id="img_id3159233"><alt xml-lang="en-US" id="alt_id3159233">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3158421" l10n="U" xml-lang="en-US" oldref="3">Step Out</paragraph>
diff --git a/helpcontent2/source/text/sbasic/shared/02/11170000.xhp b/helpcontent2/source/text/sbasic/shared/02/11170000.xhp
index d1bcd99c4a..e7437ab997 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11170000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11170000.xhp
@@ -48,7 +48,7 @@
             <tablerow>
                <tablecell>
                   <paragraph xml-lang="en-US" id="par_id3143267" role="paragraph" l10n="E">
-<image id="img_id3155339" src="res/commandimagelist/sc_managebreakpoints.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155339">Icon</alt>
+<image id="img_id3155339" src="cmd/sc_managebreakpoints.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155339">Icon</alt>
 	</image></paragraph>
                </tablecell>
                <tablecell>
diff --git a/helpcontent2/source/text/sbasic/shared/02/11180000.xhp b/helpcontent2/source/text/sbasic/shared/02/11180000.xhp
index 3bafa39354..878cde459c 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11180000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11180000.xhp
@@ -60,7 +60,7 @@
             <tablerow>
                <tablecell>
                   <paragraph xml-lang="en-US" id="par_id3143267" role="paragraph" l10n="E">
-<image id="img_id3155339" src="res/commandimagelist/sc_importdialog.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155339">Icon</alt>
+<image id="img_id3155339" src="cmd/sc_importdialog.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155339">Icon</alt>
 	</image></paragraph>
                </tablecell>
                <tablecell>
diff --git a/helpcontent2/source/text/sbasic/shared/02/11190000.xhp b/helpcontent2/source/text/sbasic/shared/02/11190000.xhp
index a78a4d2809..db89f6a64e 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11190000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11190000.xhp
@@ -48,7 +48,7 @@
             <tablerow>
                <tablecell>
                   <paragraph xml-lang="en-US" id="par_id3143267" role="paragraph" l10n="E">
-<image id="img_id3155339" src="res/commandimagelist/sc_exportdialog.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155339">Icon</alt>
+<image id="img_id3155339" src="cmd/sc_exportdialog.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155339">Icon</alt>
 	</image></paragraph>
                </tablecell>
                <tablecell>
diff --git a/helpcontent2/source/text/sbasic/shared/02/20000000.xhp b/helpcontent2/source/text/sbasic/shared/02/20000000.xhp
index edb4c80b5f..99b6937f55 100644
--- a/helpcontent2/source/text/sbasic/shared/02/20000000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/20000000.xhp
@@ -83,7 +83,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3147226" xml-lang="en-US" l10n="E">
-<image id="img_id3147571" src="res/commandimagelist/sc_choosecontrols.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147571" xml-lang="en-US">Icon</alt>
+<image id="img_id3147571" src="cmd/sc_choosecontrols.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147571" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -105,7 +105,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153824" xml-lang="en-US" l10n="E">
-<image id="img_id3157909" src="res/commandimagelist/sc_insertpushbutton.png" width="0.222inch" height="0.222inch"><alt id="alt_id3157909" xml-lang="en-US">Icon</alt>
+<image id="img_id3157909" src="cmd/sc_insertpushbutton.png" width="0.222inch" height="0.222inch"><alt id="alt_id3157909" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -119,7 +119,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154138" xml-lang="en-US" l10n="E">
-<image id="img_id3144760" src="res/commandimagelist/sc_objectcatalog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3144760" xml-lang="en-US">Icon</alt>
+<image id="img_id3144760" src="cmd/sc_objectcatalog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3144760" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -132,7 +132,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155131" xml-lang="en-US" l10n="E">
-<image id="img_id3150439" src="res/commandimagelist/sc_checkbox.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3150439" xml-lang="en-US">Icon</alt>
+<image id="img_id3150439" src="cmd/sc_checkbox.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3150439" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -145,7 +145,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155856" xml-lang="en-US" l10n="E">
-<image id="img_id3146921" src="res/commandimagelist/sc_radiobutton.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146921" xml-lang="en-US">Icon</alt>
+<image id="img_id3146921" src="cmd/sc_radiobutton.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146921" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -158,7 +158,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149300" xml-lang="en-US" l10n="E">
-<image id="img_id3153415" src="res/commandimagelist/sc_insertfixedtext.png" width="0.0874inch" height="0.0874inch"><alt id="alt_id3153415" xml-lang="en-US">Icon</alt>
+<image id="img_id3153415" src="cmd/sc_insertfixedtext.png" width="0.0874inch" height="0.0874inch"><alt id="alt_id3153415" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -171,7 +171,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153766" xml-lang="en-US" l10n="E">
-<image id="img_id3148996" src="res/commandimagelist/sc_edit.png" width="0.0874inch" height="0.0874inch"><alt id="alt_id3148996" xml-lang="en-US">Icon</alt>
+<image id="img_id3148996" src="cmd/sc_edit.png" width="0.0874inch" height="0.0874inch"><alt id="alt_id3148996" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -184,7 +184,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155959" xml-lang="en-US" l10n="E">
-<image id="img_id3163808" src="res/commandimagelist/sc_listbox.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3163808" xml-lang="en-US">Icon</alt>
+<image id="img_id3163808" src="cmd/sc_listbox.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3163808" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -197,7 +197,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3148418" xml-lang="en-US" l10n="E">
-<image id="img_id3153200" src="res/commandimagelist/sc_combobox.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3153200" xml-lang="en-US">Icon</alt>
+<image id="img_id3153200" src="cmd/sc_combobox.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3153200" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -210,7 +210,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153781" xml-lang="en-US" l10n="E">
-<image id="img_id3149530" src="res/commandimagelist/sc_hscrollbar.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149530" xml-lang="en-US">Icon</alt>
+<image id="img_id3149530" src="cmd/sc_hscrollbar.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149530" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -223,7 +223,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150515" xml-lang="en-US" l10n="E">
-<image id="img_id3150203" src="res/commandimagelist/sc_vscrollbar.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3150203" xml-lang="en-US">Icon</alt>
+<image id="img_id3150203" src="cmd/sc_vscrollbar.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3150203" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -236,7 +236,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3151184" xml-lang="en-US" l10n="E">
-<image id="img_id3151335" src="res/commandimagelist/sc_groupbox.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151335" xml-lang="en-US">Icon</alt>
+<image id="img_id3151335" src="cmd/sc_groupbox.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151335" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -250,7 +250,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3159093" xml-lang="en-US" l10n="E">
-<image id="img_id3150318" src="res/commandimagelist/sc_progressbar.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150318" xml-lang="en-US">Icon</alt>
+<image id="img_id3150318" src="cmd/sc_progressbar.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150318" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -263,7 +263,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150888" xml-lang="en-US" l10n="E">
-<image id="img_id3152872" src="res/commandimagelist/sc_hfixedline.png" width="0.2201inch" height="0.2201inch"><alt id="alt_id3152872" xml-lang="en-US">Icon</alt>
+<image id="img_id3152872" src="cmd/sc_hfixedline.png" width="0.2201inch" height="0.2201inch"><alt id="alt_id3152872" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -276,7 +276,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154913" xml-lang="en-US" l10n="E">
-<image id="img_id3153249" src="res/commandimagelist/sc_vfixedline.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153249" xml-lang="en-US">Icon</alt>
+<image id="img_id3153249" src="cmd/sc_vfixedline.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153249" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -289,7 +289,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3148901" xml-lang="en-US" l10n="E">
-<image id="img_id3151010" src="res/commandimagelist/sc_adddatefield.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151010" xml-lang="en-US">Icon</alt>
+<image id="img_id3151010" src="cmd/sc_adddatefield.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151010" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -303,7 +303,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154338" xml-lang="en-US" l10n="E">
-<image id="img_id3147077" src="res/commandimagelist/sc_timefield.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3147077" xml-lang="en-US">Icon</alt>
+<image id="img_id3147077" src="cmd/sc_timefield.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3147077" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -316,7 +316,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3146107" xml-lang="en-US" l10n="E">
-<image id="img_id3147499" src="res/commandimagelist/sc_insertnumericfield.png" width="0.0874inch" height="0.0874inch"><alt id="alt_id3147499" xml-lang="en-US">Icon</alt>
+<image id="img_id3147499" src="cmd/sc_insertnumericfield.png" width="0.0874inch" height="0.0874inch"><alt id="alt_id3147499" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -329,7 +329,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153958" xml-lang="en-US" l10n="E">
-<image id="img_id3150435" src="res/commandimagelist/sc_currencyfield.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3150435" xml-lang="en-US">Icon</alt>
+<image id="img_id3150435" src="cmd/sc_currencyfield.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3150435" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -342,7 +342,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153162" xml-lang="en-US" l10n="E">
-<image id="img_id3152807" src="res/commandimagelist/sc_formattedfield.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152807" xml-lang="en-US">Icon</alt>
+<image id="img_id3152807" src="cmd/sc_formattedfield.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152807" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -355,7 +355,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150379" xml-lang="en-US" l10n="E">
-<image id="img_id3150032" src="res/commandimagelist/sc_insertpatternfield.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3150032" xml-lang="en-US">Icon</alt>
+<image id="img_id3150032" src="cmd/sc_insertpatternfield.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3150032" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -368,7 +368,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149194" xml-lang="en-US" l10n="E">
-<image id="img_id3149101" src="res/commandimagelist/sc_filecontrol.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149101" xml-lang="en-US">Icon</alt>
+<image id="img_id3149101" src="cmd/sc_filecontrol.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149101" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -381,7 +381,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154903" xml-lang="en-US" l10n="E">
-<image id="img_id3150653" src="res/commandimagelist/sc_drawselect.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150653" xml-lang="en-US">Icon</alt>
+<image id="img_id3150653" src="cmd/sc_drawselect.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150653" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -394,7 +394,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3148725" xml-lang="en-US" l10n="E">
-<image id="img_id3146874" src="res/commandimagelist/sc_controlproperties.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3146874" xml-lang="en-US">Icon</alt>
+<image id="img_id3146874" src="cmd/sc_controlproperties.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3146874" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -407,7 +407,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3147417" xml-lang="en-US" l10n="E">
-<image id="img_id3148883" src="res/commandimagelist/sc_testmode.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148883" xml-lang="en-US">Icon</alt>
+<image id="img_id3148883" src="cmd/sc_testmode.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148883" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -420,7 +420,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id2320017" xml-lang="en-US" l10n="NEW">
-<image id="img_id2856837" src="res/commandimagelist/sc_managelanguage.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id2856837" xml-lang="en-US">Manage Language icon</alt>
+<image id="img_id2856837" src="cmd/sc_managelanguage.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id2856837" xml-lang="en-US">Manage Language icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -433,7 +433,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id7511520" xml-lang="en-US" l10n="NEW">
-<image id="Graphic2" src="res/commandimagelist/sc_inserttreecontrol.png" width="0.1665inch" height="0.1665inch"><alt id="alt_" xml-lang="en-US">Manage Language icon</alt>
+<image id="Graphic2" src="cmd/sc_inserttreecontrol.png" width="0.1665inch" height="0.1665inch"><alt id="alt_" xml-lang="en-US">Manage Language icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/sbasic/shared/03000000.xhp b/helpcontent2/source/text/sbasic/shared/03000000.xhp
index c711057ae5..c711057ae5 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03000000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03000000.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03010000.xhp b/helpcontent2/source/text/sbasic/shared/03010000.xhp
index 3933cc1127..3933cc1127 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03010000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03010000.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03010100.xhp b/helpcontent2/source/text/sbasic/shared/03010100.xhp
index 7576321a2d..7576321a2d 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03010100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03010100.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03010101.xhp b/helpcontent2/source/text/sbasic/shared/03010101.xhp
index ea55124c10..ea55124c10 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03010101.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03010101.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03010102.xhp b/helpcontent2/source/text/sbasic/shared/03010102.xhp
index 1fb2282ed9..1fb2282ed9 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03010102.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03010102.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03010200.xhp b/helpcontent2/source/text/sbasic/shared/03010200.xhp
index 6e345d5594..6e345d5594 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03010200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03010200.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03010201.xhp b/helpcontent2/source/text/sbasic/shared/03010201.xhp
index 4444a852d6..4444a852d6 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03010201.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03010201.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03010300.xhp b/helpcontent2/source/text/sbasic/shared/03010300.xhp
index dfa213c87a..dfa213c87a 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03010300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03010300.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03010301.xhp b/helpcontent2/source/text/sbasic/shared/03010301.xhp
index cd47e2f444..cd47e2f444 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03010301.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03010301.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03010302.xhp b/helpcontent2/source/text/sbasic/shared/03010302.xhp
index 173a357f27..173a357f27 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03010302.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03010302.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03010303.xhp b/helpcontent2/source/text/sbasic/shared/03010303.xhp
index b494ac3e87..b494ac3e87 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03010303.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03010303.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03010304.xhp b/helpcontent2/source/text/sbasic/shared/03010304.xhp
index 92eaedf6fc..92eaedf6fc 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03010304.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03010304.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03010305.xhp b/helpcontent2/source/text/sbasic/shared/03010305.xhp
index 32d8275ad9..32d8275ad9 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03010305.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03010305.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03020000.xhp b/helpcontent2/source/text/sbasic/shared/03020000.xhp
index 0506ee551d..0506ee551d 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03020000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020000.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03020100.xhp b/helpcontent2/source/text/sbasic/shared/03020100.xhp
index 1da4f62aeb..1da4f62aeb 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03020100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020100.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03020101.xhp b/helpcontent2/source/text/sbasic/shared/03020101.xhp
index 90ea0073a8..90ea0073a8 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03020101.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020101.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03020102.xhp b/helpcontent2/source/text/sbasic/shared/03020102.xhp
index 24a5371b44..24a5371b44 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03020102.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020102.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03020104.xhp b/helpcontent2/source/text/sbasic/shared/03020104.xhp
index 3148bd7837..3148bd7837 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03020104.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020104.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03020200.xhp b/helpcontent2/source/text/sbasic/shared/03020200.xhp
index 56399f99a5..56399f99a5 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03020200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020200.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03020201.xhp b/helpcontent2/source/text/sbasic/shared/03020201.xhp
index abdadef468..abdadef468 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03020201.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020201.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03020202.xhp b/helpcontent2/source/text/sbasic/shared/03020202.xhp
index c54904f41a..c54904f41a 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03020202.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020202.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03020203.xhp b/helpcontent2/source/text/sbasic/shared/03020203.xhp
index f1f589fa53..f1f589fa53 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03020203.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020203.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03020204.xhp b/helpcontent2/source/text/sbasic/shared/03020204.xhp
index 6abfac8191..6abfac8191 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03020204.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020204.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03020205.xhp b/helpcontent2/source/text/sbasic/shared/03020205.xhp
index adeafa7a8c..adeafa7a8c 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03020205.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020205.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03020301.xhp b/helpcontent2/source/text/sbasic/shared/03020301.xhp
index 7d688e8709..7d688e8709 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03020301.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020301.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03020302.xhp b/helpcontent2/source/text/sbasic/shared/03020302.xhp
index ab52b90844..ab52b90844 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03020302.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020302.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03020304.xhp b/helpcontent2/source/text/sbasic/shared/03020304.xhp
index 3c7af7086a..3c7af7086a 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03020304.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020304.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03020305.xhp b/helpcontent2/source/text/sbasic/shared/03020305.xhp
index 97fee841d3..97fee841d3 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03020305.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020305.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03020400.xhp b/helpcontent2/source/text/sbasic/shared/03020400.xhp
index 9229c77f82..9229c77f82 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03020400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020400.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03020402.xhp b/helpcontent2/source/text/sbasic/shared/03020402.xhp
index bdf367d13b..bdf367d13b 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03020402.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020402.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03020403.xhp b/helpcontent2/source/text/sbasic/shared/03020403.xhp
index 7fc3aba96d..7fc3aba96d 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03020403.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020403.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03020404.xhp b/helpcontent2/source/text/sbasic/shared/03020404.xhp
index 1039e79afa..1039e79afa 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03020404.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020404.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03020407.xhp b/helpcontent2/source/text/sbasic/shared/03020407.xhp
index 24ae04ddd5..24ae04ddd5 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03020407.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020407.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03020408.xhp b/helpcontent2/source/text/sbasic/shared/03020408.xhp
index ca2e86c9b9..ca2e86c9b9 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03020408.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020408.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03020409.xhp b/helpcontent2/source/text/sbasic/shared/03020409.xhp
index 4c2a38bbfc..4c2a38bbfc 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03020409.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020409.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03020410.xhp b/helpcontent2/source/text/sbasic/shared/03020410.xhp
index 8d135b15fc..8d135b15fc 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03020410.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020410.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03020411.xhp b/helpcontent2/source/text/sbasic/shared/03020411.xhp
index 0b44caf346..0b44caf346 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03020411.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020411.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03020412.xhp b/helpcontent2/source/text/sbasic/shared/03020412.xhp
index 9e663f0471..9e663f0471 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03020412.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020412.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03020413.xhp b/helpcontent2/source/text/sbasic/shared/03020413.xhp
index 9dbb1e0425..9dbb1e0425 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03020413.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020413.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03020414.xhp b/helpcontent2/source/text/sbasic/shared/03020414.xhp
index a2dbedb627..a2dbedb627 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03020414.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020414.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03020415.xhp b/helpcontent2/source/text/sbasic/shared/03020415.xhp
index 4b1e4fd9c2..4b1e4fd9c2 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03020415.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03020415.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03030100.xhp b/helpcontent2/source/text/sbasic/shared/03030100.xhp
index 1489f80a32..1489f80a32 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03030100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030100.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03030101.xhp b/helpcontent2/source/text/sbasic/shared/03030101.xhp
index 9fe3295c8b..9fe3295c8b 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03030101.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030101.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03030102.xhp b/helpcontent2/source/text/sbasic/shared/03030102.xhp
index 917e95ef23..917e95ef23 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03030102.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030102.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03030103.xhp b/helpcontent2/source/text/sbasic/shared/03030103.xhp
index 045f688bf8..045f688bf8 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03030103.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030103.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03030104.xhp b/helpcontent2/source/text/sbasic/shared/03030104.xhp
index 989f0af76b..989f0af76b 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03030104.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030104.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03030105.xhp b/helpcontent2/source/text/sbasic/shared/03030105.xhp
index aa9070caf0..aa9070caf0 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03030105.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030105.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03030106.xhp b/helpcontent2/source/text/sbasic/shared/03030106.xhp
index e1690c69b5..e1690c69b5 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03030106.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030106.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03030107.xhp b/helpcontent2/source/text/sbasic/shared/03030107.xhp
index 4ea3d4dd1c..4ea3d4dd1c 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03030107.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030107.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03030108.xhp b/helpcontent2/source/text/sbasic/shared/03030108.xhp
index 3d92632be8..3d92632be8 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03030108.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030108.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03030110.xhp b/helpcontent2/source/text/sbasic/shared/03030110.xhp
index 465e018dcf..465e018dcf 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03030110.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030110.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03030120.xhp b/helpcontent2/source/text/sbasic/shared/03030120.xhp
index cdde5b22e2..cdde5b22e2 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03030120.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030120.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03030130.xhp b/helpcontent2/source/text/sbasic/shared/03030130.xhp
index 6f4177a00e..6f4177a00e 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03030130.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030130.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03030200.xhp b/helpcontent2/source/text/sbasic/shared/03030200.xhp
index c6b8fea8f7..c6b8fea8f7 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03030200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030200.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03030201.xhp b/helpcontent2/source/text/sbasic/shared/03030201.xhp
index 2164fb0f6c..2164fb0f6c 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03030201.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030201.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03030202.xhp b/helpcontent2/source/text/sbasic/shared/03030202.xhp
index 3369b16cb3..3369b16cb3 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03030202.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030202.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03030203.xhp b/helpcontent2/source/text/sbasic/shared/03030203.xhp
index a487c3aad2..a487c3aad2 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03030203.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030203.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03030204.xhp b/helpcontent2/source/text/sbasic/shared/03030204.xhp
index d75415cee2..d75415cee2 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03030204.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030204.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03030205.xhp b/helpcontent2/source/text/sbasic/shared/03030205.xhp
index cc9488b1c1..cc9488b1c1 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03030205.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030205.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03030206.xhp b/helpcontent2/source/text/sbasic/shared/03030206.xhp
index 38e122ce1b..38e122ce1b 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03030206.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030206.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03030300.xhp b/helpcontent2/source/text/sbasic/shared/03030300.xhp
index 8d06a2cb0d..8d06a2cb0d 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03030300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030300.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03030301.xhp b/helpcontent2/source/text/sbasic/shared/03030301.xhp
index e2ce260e26..e2ce260e26 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03030301.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030301.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03030302.xhp b/helpcontent2/source/text/sbasic/shared/03030302.xhp
index 6aa8ec82d0..6aa8ec82d0 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03030302.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030302.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03050000.xhp b/helpcontent2/source/text/sbasic/shared/03050000.xhp
index cd3b0e5576..cd3b0e5576 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03050000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03050000.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03050200.xhp b/helpcontent2/source/text/sbasic/shared/03050200.xhp
index dbde24b186..dbde24b186 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03050200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03050200.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03050300.xhp b/helpcontent2/source/text/sbasic/shared/03050300.xhp
index c49ea8698c..c49ea8698c 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03050300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03050300.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03050500.xhp b/helpcontent2/source/text/sbasic/shared/03050500.xhp
index bfe33b087a..bfe33b087a 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03050500.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03050500.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03060000.xhp b/helpcontent2/source/text/sbasic/shared/03060000.xhp
index bf34d09cdb..bf34d09cdb 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03060000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03060000.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03060100.xhp b/helpcontent2/source/text/sbasic/shared/03060100.xhp
index d7f81d5f0c..d7f81d5f0c 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03060100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03060100.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03060200.xhp b/helpcontent2/source/text/sbasic/shared/03060200.xhp
index 77980f7b59..77980f7b59 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03060200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03060200.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03060300.xhp b/helpcontent2/source/text/sbasic/shared/03060300.xhp
index c891476a31..c891476a31 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03060300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03060300.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03060400.xhp b/helpcontent2/source/text/sbasic/shared/03060400.xhp
index 996cfcc457..996cfcc457 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03060400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03060400.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03060500.xhp b/helpcontent2/source/text/sbasic/shared/03060500.xhp
index d0d7e83718..d0d7e83718 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03060500.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03060500.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03060600.xhp b/helpcontent2/source/text/sbasic/shared/03060600.xhp
index 89630ce40e..89630ce40e 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03060600.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03060600.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03070000.xhp b/helpcontent2/source/text/sbasic/shared/03070000.xhp
index 92c235dad3..92c235dad3 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03070000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03070000.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03070100.xhp b/helpcontent2/source/text/sbasic/shared/03070100.xhp
index 2b3eca0877..2b3eca0877 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03070100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03070100.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03070200.xhp b/helpcontent2/source/text/sbasic/shared/03070200.xhp
index d159319b31..d159319b31 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03070200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03070200.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03070300.xhp b/helpcontent2/source/text/sbasic/shared/03070300.xhp
index c0cdd58fb6..c0cdd58fb6 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03070300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03070300.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03070400.xhp b/helpcontent2/source/text/sbasic/shared/03070400.xhp
index 187a92dc46..187a92dc46 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03070400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03070400.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03070500.xhp b/helpcontent2/source/text/sbasic/shared/03070500.xhp
index 7e713b71bf..7e713b71bf 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03070500.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03070500.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03070600.xhp b/helpcontent2/source/text/sbasic/shared/03070600.xhp
index 731a6e699c..731a6e699c 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03070600.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03070600.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03080000.xhp b/helpcontent2/source/text/sbasic/shared/03080000.xhp
index 7326dd2f4b..7326dd2f4b 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03080000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080000.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03080100.xhp b/helpcontent2/source/text/sbasic/shared/03080100.xhp
index beab2747ba..beab2747ba 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03080100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080100.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03080101.xhp b/helpcontent2/source/text/sbasic/shared/03080101.xhp
index 3961f03df0..3961f03df0 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03080101.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080101.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03080102.xhp b/helpcontent2/source/text/sbasic/shared/03080102.xhp
index 64c45466b1..64c45466b1 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03080102.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080102.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03080103.xhp b/helpcontent2/source/text/sbasic/shared/03080103.xhp
index 15a0eec358..15a0eec358 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03080103.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080103.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03080104.xhp b/helpcontent2/source/text/sbasic/shared/03080104.xhp
index 2ddf64330d..2ddf64330d 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03080104.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080104.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03080200.xhp b/helpcontent2/source/text/sbasic/shared/03080200.xhp
index 1b26e8576b..1b26e8576b 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03080200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080200.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03080201.xhp b/helpcontent2/source/text/sbasic/shared/03080201.xhp
index 47b1b8af17..47b1b8af17 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03080201.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080201.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03080202.xhp b/helpcontent2/source/text/sbasic/shared/03080202.xhp
index 1eb316b05e..1eb316b05e 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03080202.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080202.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03080300.xhp b/helpcontent2/source/text/sbasic/shared/03080300.xhp
index bb638cb99a..bb638cb99a 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03080300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080300.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03080301.xhp b/helpcontent2/source/text/sbasic/shared/03080301.xhp
index 22f62b069f..22f62b069f 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03080301.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080301.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03080302.xhp b/helpcontent2/source/text/sbasic/shared/03080302.xhp
index 92f33def84..92f33def84 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03080302.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080302.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03080400.xhp b/helpcontent2/source/text/sbasic/shared/03080400.xhp
index 6873e25b0f..6873e25b0f 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03080400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080400.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03080401.xhp b/helpcontent2/source/text/sbasic/shared/03080401.xhp
index 09fb2f79b9..09fb2f79b9 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03080401.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080401.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03080500.xhp b/helpcontent2/source/text/sbasic/shared/03080500.xhp
index b1a83c9aa5..b1a83c9aa5 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03080500.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080500.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03080501.xhp b/helpcontent2/source/text/sbasic/shared/03080501.xhp
index 1248c4a2e1..1248c4a2e1 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03080501.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080501.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03080502.xhp b/helpcontent2/source/text/sbasic/shared/03080502.xhp
index a5f2933a79..a5f2933a79 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03080502.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080502.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03080600.xhp b/helpcontent2/source/text/sbasic/shared/03080600.xhp
index ab667dc1de..ab667dc1de 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03080600.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080600.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03080601.xhp b/helpcontent2/source/text/sbasic/shared/03080601.xhp
index 140794fdf1..140794fdf1 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03080601.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080601.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03080700.xhp b/helpcontent2/source/text/sbasic/shared/03080700.xhp
index 380030c70c..380030c70c 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03080700.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080700.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03080701.xhp b/helpcontent2/source/text/sbasic/shared/03080701.xhp
index 447ce29eac..447ce29eac 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03080701.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080701.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03080800.xhp b/helpcontent2/source/text/sbasic/shared/03080800.xhp
index a5de8cab8b..a5de8cab8b 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03080800.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080800.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03080801.xhp b/helpcontent2/source/text/sbasic/shared/03080801.xhp
index 7d751a1fdd..7d751a1fdd 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03080801.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080801.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03080802.xhp b/helpcontent2/source/text/sbasic/shared/03080802.xhp
index 4c506bd2da..4c506bd2da 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03080802.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03080802.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03090000.xhp b/helpcontent2/source/text/sbasic/shared/03090000.xhp
index e80019e2ca..e80019e2ca 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03090000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090000.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03090100.xhp b/helpcontent2/source/text/sbasic/shared/03090100.xhp
index 5e2d431e5f..5e2d431e5f 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03090100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090100.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03090102.xhp b/helpcontent2/source/text/sbasic/shared/03090102.xhp
index 80fdedca72..80fdedca72 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03090102.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090102.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03090103.xhp b/helpcontent2/source/text/sbasic/shared/03090103.xhp
index 4c9f803f62..4c9f803f62 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03090103.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090103.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03090200.xhp b/helpcontent2/source/text/sbasic/shared/03090200.xhp
index df0cc09fe1..df0cc09fe1 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03090200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090200.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03090201.xhp b/helpcontent2/source/text/sbasic/shared/03090201.xhp
index e3a08323c7..e3a08323c7 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03090201.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090201.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03090202.xhp b/helpcontent2/source/text/sbasic/shared/03090202.xhp
index 04131b1f1f..04131b1f1f 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03090202.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090202.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03090203.xhp b/helpcontent2/source/text/sbasic/shared/03090203.xhp
index 92464b0c7c..92464b0c7c 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03090203.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090203.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03090300.xhp b/helpcontent2/source/text/sbasic/shared/03090300.xhp
index 50a44c5bdd..50a44c5bdd 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03090300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090300.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03090400.xhp b/helpcontent2/source/text/sbasic/shared/03090400.xhp
index bf9957b45f..bf9957b45f 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03090400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090400.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03090402.xhp b/helpcontent2/source/text/sbasic/shared/03090402.xhp
index 5eda3d85b1..5eda3d85b1 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03090402.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090402.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03090404.xhp b/helpcontent2/source/text/sbasic/shared/03090404.xhp
index 93b9fd167b..93b9fd167b 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03090404.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090404.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03090406.xhp b/helpcontent2/source/text/sbasic/shared/03090406.xhp
index c6f24dc8cf..c6f24dc8cf 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03090406.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090406.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03090408.xhp b/helpcontent2/source/text/sbasic/shared/03090408.xhp
index ff2f3de86a..ff2f3de86a 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03090408.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090408.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03090409.xhp b/helpcontent2/source/text/sbasic/shared/03090409.xhp
index 137f6f7ed6..137f6f7ed6 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03090409.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090409.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03090410.xhp b/helpcontent2/source/text/sbasic/shared/03090410.xhp
index 9a6b0833d9..9a6b0833d9 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03090410.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090410.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03090411.xhp b/helpcontent2/source/text/sbasic/shared/03090411.xhp
index 27f0d54f6f..27f0d54f6f 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03090411.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090411.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03100000.xhp b/helpcontent2/source/text/sbasic/shared/03100000.xhp
index 221b239ba6..221b239ba6 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03100000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03100000.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03100050.xhp b/helpcontent2/source/text/sbasic/shared/03100050.xhp
index 553c6dd6a2..553c6dd6a2 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03100050.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03100050.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03100060.xhp b/helpcontent2/source/text/sbasic/shared/03100060.xhp
index 2c4f6de731..2c4f6de731 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03100060.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03100060.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03100070.xhp b/helpcontent2/source/text/sbasic/shared/03100070.xhp
index a1db6c4139..a1db6c4139 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03100070.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03100070.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03100080.xhp b/helpcontent2/source/text/sbasic/shared/03100080.xhp
index fc66d023f0..fc66d023f0 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03100080.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03100080.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03100100.xhp b/helpcontent2/source/text/sbasic/shared/03100100.xhp
index f8fd76636d..f8fd76636d 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03100100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03100100.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03100300.xhp b/helpcontent2/source/text/sbasic/shared/03100300.xhp
index 2b203d3634..2b203d3634 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03100300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03100300.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03100400.xhp b/helpcontent2/source/text/sbasic/shared/03100400.xhp
index f454264895..f454264895 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03100400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03100400.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03100500.xhp b/helpcontent2/source/text/sbasic/shared/03100500.xhp
index ce93b797cb..ce93b797cb 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03100500.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03100500.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03100600.xhp b/helpcontent2/source/text/sbasic/shared/03100600.xhp
index 335ff9e8f3..335ff9e8f3 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03100600.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03100600.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03100700.xhp b/helpcontent2/source/text/sbasic/shared/03100700.xhp
index e5c70dc0ff..e5c70dc0ff 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03100700.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03100700.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03100900.xhp b/helpcontent2/source/text/sbasic/shared/03100900.xhp
index 399c343a66..399c343a66 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03100900.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03100900.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03101000.xhp b/helpcontent2/source/text/sbasic/shared/03101000.xhp
index 2526f059e6..2526f059e6 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03101000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03101000.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03101100.xhp b/helpcontent2/source/text/sbasic/shared/03101100.xhp
index 7cd0976459..7cd0976459 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03101100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03101100.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03101110.xhp b/helpcontent2/source/text/sbasic/shared/03101110.xhp
index ac0682cfff..ac0682cfff 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03101110.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03101110.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03101120.xhp b/helpcontent2/source/text/sbasic/shared/03101120.xhp
index 5477e07623..5477e07623 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03101120.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03101120.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03101130.xhp b/helpcontent2/source/text/sbasic/shared/03101130.xhp
index be99de3a82..be99de3a82 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03101130.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03101130.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03101140.xhp b/helpcontent2/source/text/sbasic/shared/03101140.xhp
index 5654e043bf..5654e043bf 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03101140.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03101140.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03101300.xhp b/helpcontent2/source/text/sbasic/shared/03101300.xhp
index fa8828313d..fa8828313d 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03101300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03101300.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03101400.xhp b/helpcontent2/source/text/sbasic/shared/03101400.xhp
index 88146bebbb..88146bebbb 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03101400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03101400.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03101500.xhp b/helpcontent2/source/text/sbasic/shared/03101500.xhp
index 4b59301441..4b59301441 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03101500.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03101500.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03101600.xhp b/helpcontent2/source/text/sbasic/shared/03101600.xhp
index 8e236758d3..8e236758d3 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03101600.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03101600.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03101700.xhp b/helpcontent2/source/text/sbasic/shared/03101700.xhp
index eb631019b0..eb631019b0 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03101700.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03101700.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03102000.xhp b/helpcontent2/source/text/sbasic/shared/03102000.xhp
index 6402243a69..6402243a69 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03102000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03102000.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03102101.xhp b/helpcontent2/source/text/sbasic/shared/03102101.xhp
index 54df46fb07..54df46fb07 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03102101.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03102101.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03102200.xhp b/helpcontent2/source/text/sbasic/shared/03102200.xhp
index 8fc1189909..8fc1189909 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03102200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03102200.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03102300.xhp b/helpcontent2/source/text/sbasic/shared/03102300.xhp
index b5507de522..b5507de522 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03102300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03102300.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03102400.xhp b/helpcontent2/source/text/sbasic/shared/03102400.xhp
index 6f9789a2a9..6f9789a2a9 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03102400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03102400.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03102450.xhp b/helpcontent2/source/text/sbasic/shared/03102450.xhp
index 08a8a48e40..08a8a48e40 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03102450.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03102450.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03102600.xhp b/helpcontent2/source/text/sbasic/shared/03102600.xhp
index 750c23b8a5..750c23b8a5 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03102600.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03102600.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03102700.xhp b/helpcontent2/source/text/sbasic/shared/03102700.xhp
index 8c31eed8e8..8c31eed8e8 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03102700.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03102700.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03102800.xhp b/helpcontent2/source/text/sbasic/shared/03102800.xhp
index 8c7724ccaa..8c7724ccaa 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03102800.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03102800.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03102900.xhp b/helpcontent2/source/text/sbasic/shared/03102900.xhp
index d0662a78f2..d0662a78f2 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03102900.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03102900.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03103000.xhp b/helpcontent2/source/text/sbasic/shared/03103000.xhp
index 997edf5be1..997edf5be1 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03103000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03103000.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03103400.xhp b/helpcontent2/source/text/sbasic/shared/03103400.xhp
index b73e28bdd2..b73e28bdd2 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03103400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03103400.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03103450.xhp b/helpcontent2/source/text/sbasic/shared/03103450.xhp
index c9e5d8e41c..c9e5d8e41c 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03103450.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03103450.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03103600.xhp b/helpcontent2/source/text/sbasic/shared/03103600.xhp
index 7f09ef0a5f..7f09ef0a5f 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03103600.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03103600.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03103700.xhp b/helpcontent2/source/text/sbasic/shared/03103700.xhp
index 6d7fe49280..6d7fe49280 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03103700.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03103700.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03103800.xhp b/helpcontent2/source/text/sbasic/shared/03103800.xhp
index f592aa7387..f592aa7387 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03103800.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03103800.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03103900.xhp b/helpcontent2/source/text/sbasic/shared/03103900.xhp
index 738a06fd5f..738a06fd5f 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03103900.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03103900.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03104000.xhp b/helpcontent2/source/text/sbasic/shared/03104000.xhp
index 08dfb3bc81..08dfb3bc81 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03104000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03104000.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03104100.xhp b/helpcontent2/source/text/sbasic/shared/03104100.xhp
index 14cfd9885a..14cfd9885a 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03104100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03104100.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03104200.xhp b/helpcontent2/source/text/sbasic/shared/03104200.xhp
index 258e10da24..258e10da24 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03104200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03104200.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03104300.xhp b/helpcontent2/source/text/sbasic/shared/03104300.xhp
index d0b1dd4360..d0b1dd4360 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03104300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03104300.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03104400.xhp b/helpcontent2/source/text/sbasic/shared/03104400.xhp
index 158530170f..158530170f 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03104400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03104400.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03104600.xhp b/helpcontent2/source/text/sbasic/shared/03104600.xhp
index 0232d2d45e..0232d2d45e 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03104600.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03104600.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03104700.xhp b/helpcontent2/source/text/sbasic/shared/03104700.xhp
index 6ebf6c920a..6ebf6c920a 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03104700.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03104700.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03110000.xhp b/helpcontent2/source/text/sbasic/shared/03110000.xhp
index 959142886c..959142886c 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03110000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03110000.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03110100.xhp b/helpcontent2/source/text/sbasic/shared/03110100.xhp
index c59cdbc92a..c59cdbc92a 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03110100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03110100.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120000.xhp b/helpcontent2/source/text/sbasic/shared/03120000.xhp
index 82356acb6d..82356acb6d 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120000.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120100.xhp b/helpcontent2/source/text/sbasic/shared/03120100.xhp
index 8dc81f6c12..8dc81f6c12 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120100.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120101.xhp b/helpcontent2/source/text/sbasic/shared/03120101.xhp
index 39f9b6e0d1..39f9b6e0d1 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120101.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120101.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120102.xhp b/helpcontent2/source/text/sbasic/shared/03120102.xhp
index 590668b1ad..590668b1ad 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120102.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120102.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120103.xhp b/helpcontent2/source/text/sbasic/shared/03120103.xhp
index 725610b571..725610b571 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120103.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120103.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120104.xhp b/helpcontent2/source/text/sbasic/shared/03120104.xhp
index 4053a9a5d8..4053a9a5d8 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120104.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120104.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120105.xhp b/helpcontent2/source/text/sbasic/shared/03120105.xhp
index e7594f0514..e7594f0514 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120105.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120105.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120200.xhp b/helpcontent2/source/text/sbasic/shared/03120200.xhp
index 54d7402f4f..54d7402f4f 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120200.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120201.xhp b/helpcontent2/source/text/sbasic/shared/03120201.xhp
index 128cdf3620..128cdf3620 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120201.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120201.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120202.xhp b/helpcontent2/source/text/sbasic/shared/03120202.xhp
index 249fe5004b..249fe5004b 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120202.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120202.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120300.xhp b/helpcontent2/source/text/sbasic/shared/03120300.xhp
index 35b220c429..35b220c429 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120300.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120301.xhp b/helpcontent2/source/text/sbasic/shared/03120301.xhp
index f5435495f2..f5435495f2 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120301.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120301.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120302.xhp b/helpcontent2/source/text/sbasic/shared/03120302.xhp
index a4eb0af31f..a4eb0af31f 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120302.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120302.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120303.xhp b/helpcontent2/source/text/sbasic/shared/03120303.xhp
index a96828cee1..a96828cee1 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120303.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120303.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120304.xhp b/helpcontent2/source/text/sbasic/shared/03120304.xhp
index d4ac846723..d4ac846723 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120304.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120304.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120305.xhp b/helpcontent2/source/text/sbasic/shared/03120305.xhp
index 90b9e7e36c..90b9e7e36c 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120305.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120305.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120306.xhp b/helpcontent2/source/text/sbasic/shared/03120306.xhp
index aa27f9f7d4..aa27f9f7d4 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120306.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120306.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120307.xhp b/helpcontent2/source/text/sbasic/shared/03120307.xhp
index 88bd2d6dc5..88bd2d6dc5 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120307.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120307.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120308.xhp b/helpcontent2/source/text/sbasic/shared/03120308.xhp
index 3fcea46178..3fcea46178 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120308.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120308.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120309.xhp b/helpcontent2/source/text/sbasic/shared/03120309.xhp
index cfdc43abe5..cfdc43abe5 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120309.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120309.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120310.xhp b/helpcontent2/source/text/sbasic/shared/03120310.xhp
index 5cd4875be7..5cd4875be7 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120310.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120310.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120311.xhp b/helpcontent2/source/text/sbasic/shared/03120311.xhp
index 367c2ed9d8..367c2ed9d8 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120311.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120311.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120312.xhp b/helpcontent2/source/text/sbasic/shared/03120312.xhp
index 0c610ab041..0c610ab041 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120312.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120312.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120313.xhp b/helpcontent2/source/text/sbasic/shared/03120313.xhp
index dbf641cae3..dbf641cae3 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120313.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120313.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120314.xhp b/helpcontent2/source/text/sbasic/shared/03120314.xhp
index fcd61b6598..fcd61b6598 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120314.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120314.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120315.xhp b/helpcontent2/source/text/sbasic/shared/03120315.xhp
index 35b8e37fa8..35b8e37fa8 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120315.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120315.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120400.xhp b/helpcontent2/source/text/sbasic/shared/03120400.xhp
index 2149ad51b6..2149ad51b6 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120400.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120401.xhp b/helpcontent2/source/text/sbasic/shared/03120401.xhp
index 8bb9400287..8bb9400287 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120401.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120401.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120402.xhp b/helpcontent2/source/text/sbasic/shared/03120402.xhp
index d3957d4fef..d3957d4fef 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120402.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120402.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03120403.xhp b/helpcontent2/source/text/sbasic/shared/03120403.xhp
index 6b6a17acd5..6b6a17acd5 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03120403.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120403.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03130000.xhp b/helpcontent2/source/text/sbasic/shared/03130000.xhp
index d3dd1711e7..d3dd1711e7 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03130000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03130000.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03130100.xhp b/helpcontent2/source/text/sbasic/shared/03130100.xhp
index e89c6c5e65..e89c6c5e65 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03130100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03130100.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03130500.xhp b/helpcontent2/source/text/sbasic/shared/03130500.xhp
index 82ac7a14f9..82ac7a14f9 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03130500.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03130500.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03130600.xhp b/helpcontent2/source/text/sbasic/shared/03130600.xhp
index e871a9e800..e871a9e800 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03130600.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03130600.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03130700.xhp b/helpcontent2/source/text/sbasic/shared/03130700.xhp
index da0b5f6cc7..da0b5f6cc7 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03130700.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03130700.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03130800.xhp b/helpcontent2/source/text/sbasic/shared/03130800.xhp
index d0590c2309..d0590c2309 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03130800.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03130800.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03131000.xhp b/helpcontent2/source/text/sbasic/shared/03131000.xhp
index 286021e969..286021e969 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03131000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03131000.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03131300.xhp b/helpcontent2/source/text/sbasic/shared/03131300.xhp
index 01d730012d..01d730012d 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03131300.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03131300.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03131400.xhp b/helpcontent2/source/text/sbasic/shared/03131400.xhp
index 35d90c75b6..35d90c75b6 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03131400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03131400.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03131500.xhp b/helpcontent2/source/text/sbasic/shared/03131500.xhp
index a20e071e64..a20e071e64 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03131500.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03131500.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03131600.xhp b/helpcontent2/source/text/sbasic/shared/03131600.xhp
index 258f3a8a36..258f3a8a36 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03131600.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03131600.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03131700.xhp b/helpcontent2/source/text/sbasic/shared/03131700.xhp
index e01f900ecb..e01f900ecb 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03131700.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03131700.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03131800.xhp b/helpcontent2/source/text/sbasic/shared/03131800.xhp
index 86f5893aeb..86f5893aeb 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03131800.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03131800.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03131900.xhp b/helpcontent2/source/text/sbasic/shared/03131900.xhp
index 64acd20e27..64acd20e27 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03131900.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03131900.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03132100.xhp b/helpcontent2/source/text/sbasic/shared/03132100.xhp
index 7f5d32edad..7f5d32edad 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03132100.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03132100.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/03132200.xhp b/helpcontent2/source/text/sbasic/shared/03132200.xhp
index 6e62c94cac..6e62c94cac 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/03132200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03132200.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/05060700.xhp b/helpcontent2/source/text/sbasic/shared/05060700.xhp
index 332d569cc1..332d569cc1 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/05060700.xhp
+++ b/helpcontent2/source/text/sbasic/shared/05060700.xhp
diff --git a/helpcontent2/source/text/sbasic/shared/keys.xhp b/helpcontent2/source/text/sbasic/shared/keys.xhp
index 16bf7a5ab6..16bf7a5ab6 100755..100644
--- a/helpcontent2/source/text/sbasic/shared/keys.xhp
+++ b/helpcontent2/source/text/sbasic/shared/keys.xhp
diff --git a/helpcontent2/source/text/scalc/00/00000004.xhp b/helpcontent2/source/text/scalc/00/00000004.xhp
index 9dfc242af6..9dfc242af6 100755..100644
--- a/helpcontent2/source/text/scalc/00/00000004.xhp
+++ b/helpcontent2/source/text/scalc/00/00000004.xhp
diff --git a/helpcontent2/source/text/scalc/00/00000402.xhp b/helpcontent2/source/text/scalc/00/00000402.xhp
index aef592156e..aef592156e 100755..100644
--- a/helpcontent2/source/text/scalc/00/00000402.xhp
+++ b/helpcontent2/source/text/scalc/00/00000402.xhp
diff --git a/helpcontent2/source/text/scalc/00/00000403.xhp b/helpcontent2/source/text/scalc/00/00000403.xhp
index 2fc66f406a..2fc66f406a 100755..100644
--- a/helpcontent2/source/text/scalc/00/00000403.xhp
+++ b/helpcontent2/source/text/scalc/00/00000403.xhp
diff --git a/helpcontent2/source/text/scalc/00/00000404.xhp b/helpcontent2/source/text/scalc/00/00000404.xhp
index 53cc548826..7a6837274d 100644
--- a/helpcontent2/source/text/scalc/00/00000404.xhp
+++ b/helpcontent2/source/text/scalc/00/00000404.xhp
@@ -58,7 +58,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149656" xml-lang="en-US" l10n="E">
-<image id="img_id3154365" src="res/commandimagelist/sc_inscellsctrl.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154365" xml-lang="en-US">Icon</alt>
+<image id="img_id3154365" src="cmd/sc_inscellsctrl.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154365" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -74,7 +74,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145273" xml-lang="en-US" l10n="E">
-<image id="img_id3145364" src="res/commandimagelist/sc_insertcellsdown.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145364" xml-lang="en-US">Icon</alt>
+<image id="img_id3145364" src="cmd/sc_insertcellsdown.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145364" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -89,7 +89,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3144766" xml-lang="en-US" l10n="E">
-<image id="img_id3154942" src="res/commandimagelist/sc_insertcellsright.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154942" xml-lang="en-US">Icon</alt>
+<image id="img_id3154942" src="cmd/sc_insertcellsright.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154942" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -104,7 +104,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153838" xml-lang="en-US" l10n="E">
-<image id="img_id3153710" src="res/commandimagelist/sc_insertrows.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153710" xml-lang="en-US">Icon</alt>
+<image id="img_id3153710" src="cmd/sc_insertrows.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153710" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -119,7 +119,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3147363" xml-lang="en-US" l10n="E">
-<image id="img_id3145232" src="res/commandimagelist/sc_insertcolumns.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145232" xml-lang="en-US">Icon</alt>
+<image id="img_id3145232" src="cmd/sc_insertcolumns.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145232" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/scalc/00/00000405.xhp b/helpcontent2/source/text/scalc/00/00000405.xhp
index 706ba56461..ad0c5e26d5 100644
--- a/helpcontent2/source/text/scalc/00/00000405.xhp
+++ b/helpcontent2/source/text/scalc/00/00000405.xhp
@@ -103,7 +103,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149332" xml-lang="en-US" l10n="E">
-<image id="img_id3156020" src="res/commandimagelist/sc_autoformat.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156020" xml-lang="en-US">Icon</alt>
+<image id="img_id3156020" src="cmd/sc_autoformat.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156020" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/scalc/00/00000406.xhp b/helpcontent2/source/text/scalc/00/00000406.xhp
index 8796b4245c..8796b4245c 100755..100644
--- a/helpcontent2/source/text/scalc/00/00000406.xhp
+++ b/helpcontent2/source/text/scalc/00/00000406.xhp
diff --git a/helpcontent2/source/text/scalc/00/00000407.xhp b/helpcontent2/source/text/scalc/00/00000407.xhp
index f36bbdccd7..f36bbdccd7 100755..100644
--- a/helpcontent2/source/text/scalc/00/00000407.xhp
+++ b/helpcontent2/source/text/scalc/00/00000407.xhp
diff --git a/helpcontent2/source/text/scalc/00/00000412.xhp b/helpcontent2/source/text/scalc/00/00000412.xhp
index 09d8faede5..78cceb5d21 100644
--- a/helpcontent2/source/text/scalc/00/00000412.xhp
+++ b/helpcontent2/source/text/scalc/00/00000412.xhp
@@ -57,7 +57,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3148663" xml-lang="en-US" l10n="E">
-<image id="img_id3150543" src="res/commandimagelist/sc_sortup.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3150543" xml-lang="en-US">Icon</alt>
+<image id="img_id3150543" src="cmd/sc_sortup.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3150543" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -67,7 +67,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153969" xml-lang="en-US" l10n="E">
-<image id="img_id3125863" src="res/commandimagelist/sc_sortdown.png" width="0.1701inch" height="0.1701inch"><alt id="alt_id3125863" xml-lang="en-US">Icon</alt>
+<image id="img_id3125863" src="cmd/sc_sortdown.png" width="0.1701inch" height="0.1701inch"><alt id="alt_id3125863" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -90,7 +90,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145799" xml-lang="en-US" l10n="E">
-<image id="img_id3149413" src="res/commandimagelist/sc_datafilterautofilter.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149413" xml-lang="en-US">Icon</alt>
+<image id="img_id3149413" src="cmd/sc_datafilterautofilter.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149413" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -115,7 +115,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3148485" xml-lang="en-US" l10n="E">
-<image id="img_id3145792" src="res/commandimagelist/sc_removefilter.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145792" xml-lang="en-US">Icon</alt>
+<image id="img_id3145792" src="cmd/sc_removefilter.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145792" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -160,7 +160,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149438" xml-lang="en-US" l10n="E">
-<image id="img_id3153287" src="res/commandimagelist/sc_group.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153287" xml-lang="en-US">Icon</alt>
+<image id="img_id3153287" src="cmd/sc_group.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153287" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -180,7 +180,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150048" xml-lang="en-US" l10n="E">
-<image id="img_id3155914" src="res/commandimagelist/sc_ungroup.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155914" xml-lang="en-US">Icon</alt>
+<image id="img_id3155914" src="cmd/sc_ungroup.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155914" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/scalc/01/02110000.xhp b/helpcontent2/source/text/scalc/01/02110000.xhp
index 2d4fe56350..e2e84bc15e 100644
--- a/helpcontent2/source/text/scalc/01/02110000.xhp
+++ b/helpcontent2/source/text/scalc/01/02110000.xhp
@@ -67,7 +67,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3159264" xml-lang="en-US" l10n="E">
-<image id="img_id3147338" src="res/commandimagelist/sc_grid.png" width="0.2228in" height="0.2228in"><alt id="alt_id3147338" xml-lang="en-US">Icon</alt>
+<image id="img_id3147338" src="cmd/sc_grid.png" width="0.2228in" height="0.2228in"><alt id="alt_id3147338" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -170,7 +170,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3149947" xml-lang="en-US" l10n="E">
-<image id="img_id3159119" src="res/commandimagelist/sc_chainframes.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159119" xml-lang="en-US">Icon</alt>
+<image id="img_id3159119" src="cmd/sc_chainframes.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159119" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/scalc/01/02180000.xhp b/helpcontent2/source/text/scalc/01/02180000.xhp
index a81d84b144..d2d15b538f 100644
--- a/helpcontent2/source/text/scalc/01/02180000.xhp
+++ b/helpcontent2/source/text/scalc/01/02180000.xhp
@@ -58,10 +58,10 @@
 <paragraph role="warning" id="par_id2282479" xml-lang="en-US" l10n="NEW">When you copy and paste cells containing <link href="text/scalc/01/04060102.xhp">date values</link> between different spreadsheets, both spreadsheet documents must be set to the same date base. If date bases differ, the displayed date values will change!</paragraph>
 <bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_MOVETAB:LB_DEST" id="bm_id3146119" localize="false"/>
 <paragraph role="heading" id="hd_id3163710" xml-lang="en-US" level="2" l10n="U" oldref="3">To Document</paragraph>
-<paragraph role="paragraph" id="par_id3148645" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SC:LISTBOX:RID_SCDLG_MOVETAB:LB_DEST">Indicates where the current sheet is to be moved or copied to.</ahelp> Select <emph>new document</emph> if you want to create a new location for the sheet to be moved or copied.</paragraph>
+<paragraph role="paragraph" id="par_id3148645" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SC:LISTBOX:RID_SCDLG_MOVETAB:LB_DEST">Indicates where the current sheet is to be moved or copied to.</ahelp> Select <emph>- new document -</emph> if you want to create a new location for the sheet to be moved or copied.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_MOVETAB:LB_INSERT" id="bm_id3147350" localize="false"/>
 <paragraph role="heading" id="hd_id3154012" xml-lang="en-US" level="2" l10n="U" oldref="5">Insert Before</paragraph>
-<paragraph role="paragraph" id="par_id3145366" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:LISTBOX:RID_SCDLG_MOVETAB:LB_INSERT">The current sheet is moved or copied in front of the selected sheet.</ahelp> The <emph>move to end position</emph> option places the current sheet at the end.</paragraph>
+<paragraph role="paragraph" id="par_id3145366" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:LISTBOX:RID_SCDLG_MOVETAB:LB_INSERT">The current sheet is moved or copied in front of the selected sheet.</ahelp> The <emph>- move to end position -</emph> option places the current sheet at the end.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_MOVETAB:BTN_COPY" id="bm_id3156283" localize="false"/>
 <paragraph role="heading" id="hd_id3153726" xml-lang="en-US" level="2" l10n="U" oldref="7">Copy</paragraph>
 <paragraph role="paragraph" id="par_id3144764" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:CHECKBOX:RID_SCDLG_MOVETAB:BTN_COPY">Specifies that the sheet is to be copied. If the option is unmarked, the sheet is moved.</ahelp> Moving sheets is the default.</paragraph>
diff --git a/helpcontent2/source/text/scalc/01/02190000.xhp b/helpcontent2/source/text/scalc/01/02190000.xhp
index b3adc19a43..b3adc19a43 100755..100644
--- a/helpcontent2/source/text/scalc/01/02190000.xhp
+++ b/helpcontent2/source/text/scalc/01/02190000.xhp
diff --git a/helpcontent2/source/text/scalc/01/02200000.xhp b/helpcontent2/source/text/scalc/01/02200000.xhp
index a33e5cdab1..a33e5cdab1 100755..100644
--- a/helpcontent2/source/text/scalc/01/02200000.xhp
+++ b/helpcontent2/source/text/scalc/01/02200000.xhp
diff --git a/helpcontent2/source/text/scalc/01/04010000.xhp b/helpcontent2/source/text/scalc/01/04010000.xhp
index 2d0d408141..2d0d408141 100755..100644
--- a/helpcontent2/source/text/scalc/01/04010000.xhp
+++ b/helpcontent2/source/text/scalc/01/04010000.xhp
diff --git a/helpcontent2/source/text/scalc/01/04060100.xhp b/helpcontent2/source/text/scalc/01/04060100.xhp
index 35c6a9b7d8..a5b301b63f 100755..100644
--- a/helpcontent2/source/text/scalc/01/04060100.xhp
+++ b/helpcontent2/source/text/scalc/01/04060100.xhp
@@ -45,7 +45,7 @@
 <paragraph xml-lang="en-US" id="hd_id3154944" role="heading" level="1" l10n="CHG"
                  oldref="16">Functions by Category</paragraph>
       <paragraph xml-lang="en-US" id="par_id3149378" role="paragraph" l10n="CHG" oldref="2">This section describes the functions of $[officename] Calc. The various functions are divided into categories in the Function Wizard.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id0120200910234570" role="tip" l10n="NEW">You can find detailed explanations, illustrations, and examples of Calc functions in the <link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_Functions_listed_by_category">OpenOffice.org Wiki</link>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0120200910234570" role="tip" l10n="NEW">You can find detailed explanations, illustrations, and examples of Calc functions <link href="http://help.libreoffice.org/Calc/Functions_by_Category">in the LibreOffice WikiHelp</link>.</paragraph>
       <paragraph xml-lang="en-US" id="hd_id3146972" role="heading" level="2" l10n="U" oldref="3"><link href="text/scalc/01/04060101.xhp" name="Database">Database</link></paragraph>
       <embed href="text/scalc/01/04060101.xhp#datenbanktext"/>
       <paragraph xml-lang="en-US" id="hd_id3155443" role="heading" level="2" l10n="U" oldref="4"><link href="text/scalc/01/04060102.xhp" name="Date &amp; Time">Date &amp; Time</link></paragraph>
@@ -75,7 +75,7 @@
       <embed href="text/scalc/01/04060111.xhp#addintext"/>
       <paragraph xml-lang="en-US" id="par_id3150715" role="paragraph" l10n="U" oldref="14"><link href="text/scalc/01/04060199.xhp" name="Operators">Operators</link> are also available.</paragraph>
       <section id="relatedtopics">
-         <paragraph xml-lang="en-US" id="par_id0902200809540918" role="paragraph" l10n="NEW"><variable id="drking"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_Functions_listed_by_category">Calc functions in the OpenOffice.org Wiki</link>
+          <paragraph xml-lang="en-US" id="par_id0902200809540918" role="paragraph" l10n="NEW"><variable id="drking"><link href="http://help.libreoffice.org/Calc/Functions_by_Category">Calc Functions By Category</link> in the LibreOffice WikiHelp
 </variable></paragraph>
       </section>
    </body>
diff --git a/helpcontent2/source/text/scalc/01/04060107.xhp b/helpcontent2/source/text/scalc/01/04060107.xhp
index 4ce73cf5a9..62f07e7057 100644
--- a/helpcontent2/source/text/scalc/01/04060107.xhp
+++ b/helpcontent2/source/text/scalc/01/04060107.xhp
@@ -156,7 +156,7 @@
 <paragraph role="paragraph" id="par_id3154342" xml-lang="en-US" l10n="U" oldref="5">The cells in a results array are automatically protected against changes. However, you can edit or copy the array formula by selecting the entire array cell range.</paragraph>
 <paragraph role="heading" id="hd_id8834803" xml-lang="en-US" level="3" l10n="NEW">Using Inline Array Constants in Formulas</paragraph>
 <paragraph role="paragraph" id="par_id985747" xml-lang="en-US" l10n="NEW">Calc supports inline matrix/array constants in formulas. An inline array is surrounded by curly braces '{' and '}'. Elements can be each a number (including negatives), a logical constant (TRUE, FALSE), or a literal string. Non-constant expressions are not allowed. Arrays can be entered with one or more rows, and one or more columns. All rows must consist of the same number of elements, all columns must consist of the same number of elements. </paragraph>
-<paragraph role="paragraph" id="par_id936613" xml-lang="en-US" l10n="NEW">The column separator (separating elements in one row) is the ';' semicolon. The row separator is a '|' pipe symbol. The separators are not language and locale dependent. </paragraph>
+<paragraph role="paragraph" id="par_id936613" xml-lang="en-US" l10n="NEW">The column separator (separating elements in one row) and the row separator are language and locale dependent. But in this help content, the ';' semicolon and '|' pipe symbol are used to indicate the column and row separators, respectively. For example, in the English locale, the ',' comma is used as the column separator, while the ';' semicolon is used as the row separator.</paragraph>
 <paragraph role="paragraph" id="par_id1877498" xml-lang="en-US" l10n="NEW">Arrays can not be nested.</paragraph>
 <paragraph role="paragraph" id="par_id4262520" xml-lang="en-US" l10n="NEW">
 <emph>Examples:</emph>
diff --git a/helpcontent2/source/text/scalc/01/04060108.xhp b/helpcontent2/source/text/scalc/01/04060108.xhp
index b7fe1f036e..b7fe1f036e 100755..100644
--- a/helpcontent2/source/text/scalc/01/04060108.xhp
+++ b/helpcontent2/source/text/scalc/01/04060108.xhp
diff --git a/helpcontent2/source/text/scalc/01/04060109.xhp b/helpcontent2/source/text/scalc/01/04060109.xhp
index 9dbf21f342..853033cfde 100644
--- a/helpcontent2/source/text/scalc/01/04060109.xhp
+++ b/helpcontent2/source/text/scalc/01/04060109.xhp
@@ -218,7 +218,7 @@
          <paragraph xml-lang="en-US" id="par_id9272133" role="paragraph" l10n="NEW">
             <item type="input">=INDEX(A1:B6;0;1)</item> returns a reference to the first column of A1:B6.</paragraph>
          <paragraph xml-lang="en-US" id="par_id3158419" role="paragraph" l10n="U" oldref="58">
-            <item type="input">=INDEX((multi);4;1)</item> indicates the value contained in row 4 and column 1 of the (multiple) range, which you named under <emph>Insert - Names - Set</emph> as <emph>multi</emph>. The multiple range may consist of several rectangular ranges, each with a row 4 and column 1. If you now want to call the second block of this multiple range enter the number <item type="input">2</item> as the <emph>range</emph> parameter.</paragraph>
+            <item type="input">=INDEX((multi);4;1)</item> indicates the value contained in row 4 and column 1 of the (multiple) range, which you named under <emph>Insert - Names - Define</emph> as <emph>multi</emph>. The multiple range may consist of several rectangular ranges, each with a row 4 and column 1. If you now want to call the second block of this multiple range enter the number <item type="input">2</item> as the <emph>range</emph> parameter.</paragraph>
          <paragraph xml-lang="en-US" id="par_id3148595" role="paragraph" l10n="U" oldref="59">
             <item type="input">=INDEX(A1:B6;1;1)</item> indicates the value in the upper-left of the A1:B6 range.</paragraph>
          <paragraph xml-lang="en-US" id="par_id9960020" role="paragraph" l10n="NEW">
@@ -624,4 +624,4 @@
          <embed href="text/scalc/01/04060100.xhp#drking"/>
       </section>
    </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04070000.xhp b/helpcontent2/source/text/scalc/01/04070000.xhp
index d70036af99..d70036af99 100755..100644
--- a/helpcontent2/source/text/scalc/01/04070000.xhp
+++ b/helpcontent2/source/text/scalc/01/04070000.xhp
diff --git a/helpcontent2/source/text/scalc/01/05030000.xhp b/helpcontent2/source/text/scalc/01/05030000.xhp
index c2c32a2ba3..c2c32a2ba3 100755..100644
--- a/helpcontent2/source/text/scalc/01/05030000.xhp
+++ b/helpcontent2/source/text/scalc/01/05030000.xhp
diff --git a/helpcontent2/source/text/scalc/01/05040000.xhp b/helpcontent2/source/text/scalc/01/05040000.xhp
index 953429d55f..953429d55f 100755..100644
--- a/helpcontent2/source/text/scalc/01/05040000.xhp
+++ b/helpcontent2/source/text/scalc/01/05040000.xhp
diff --git a/helpcontent2/source/text/scalc/01/05080000.xhp b/helpcontent2/source/text/scalc/01/05080000.xhp
index 470f829778..470f829778 100755..100644
--- a/helpcontent2/source/text/scalc/01/05080000.xhp
+++ b/helpcontent2/source/text/scalc/01/05080000.xhp
diff --git a/helpcontent2/source/text/scalc/01/05100000.xhp b/helpcontent2/source/text/scalc/01/05100000.xhp
index 44a75be0a4..f37ace7b5f 100644
--- a/helpcontent2/source/text/scalc/01/05100000.xhp
+++ b/helpcontent2/source/text/scalc/01/05100000.xhp
@@ -105,7 +105,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3155087" role="paragraph" l10n="E">
-<image id="img_id3153068" src="res/commandimagelist/sc_fillstyle.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153068">Icon</alt>
+<image id="img_id3153068" src="cmd/sc_fillstyle.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153068">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
@@ -138,7 +138,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3150050" role="paragraph" l10n="E">
-<image id="img_id3154649" src="res/commandimagelist/sc_stylenewbyexample.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3154649">Icon</alt>
+<image id="img_id3154649" src="cmd/sc_stylenewbyexample.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3154649">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
@@ -155,7 +155,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3145118" role="paragraph" l10n="E">
-<image id="img_id3155754" src="res/commandimagelist/sc_styleupdatebyexample.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155754">Icon</alt>
+<image id="img_id3155754" src="cmd/sc_styleupdatebyexample.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155754">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
diff --git a/helpcontent2/source/text/scalc/01/06030000.xhp b/helpcontent2/source/text/scalc/01/06030000.xhp
index 754af7c701..754af7c701 100755..100644
--- a/helpcontent2/source/text/scalc/01/06030000.xhp
+++ b/helpcontent2/source/text/scalc/01/06030000.xhp
diff --git a/helpcontent2/source/text/scalc/01/06060000.xhp b/helpcontent2/source/text/scalc/01/06060000.xhp
index 175fee51f7..175fee51f7 100755..100644
--- a/helpcontent2/source/text/scalc/01/06060000.xhp
+++ b/helpcontent2/source/text/scalc/01/06060000.xhp
diff --git a/helpcontent2/source/text/scalc/01/06990000.xhp b/helpcontent2/source/text/scalc/01/06990000.xhp
index 5e3bdd4d47..5e3bdd4d47 100755..100644
--- a/helpcontent2/source/text/scalc/01/06990000.xhp
+++ b/helpcontent2/source/text/scalc/01/06990000.xhp
diff --git a/helpcontent2/source/text/scalc/01/12010100.xhp b/helpcontent2/source/text/scalc/01/12010100.xhp
index 4885ef34b1..4885ef34b1 100755..100644
--- a/helpcontent2/source/text/scalc/01/12010100.xhp
+++ b/helpcontent2/source/text/scalc/01/12010100.xhp
diff --git a/helpcontent2/source/text/scalc/01/12040000.xhp b/helpcontent2/source/text/scalc/01/12040000.xhp
index 8dcc45e37f..8dcc45e37f 100755..100644
--- a/helpcontent2/source/text/scalc/01/12040000.xhp
+++ b/helpcontent2/source/text/scalc/01/12040000.xhp
diff --git a/helpcontent2/source/text/scalc/01/12040201.xhp b/helpcontent2/source/text/scalc/01/12040201.xhp
index 5f6284d5da..5f6284d5da 100755..100644
--- a/helpcontent2/source/text/scalc/01/12040201.xhp
+++ b/helpcontent2/source/text/scalc/01/12040201.xhp
diff --git a/helpcontent2/source/text/scalc/01/12070100.xhp b/helpcontent2/source/text/scalc/01/12070100.xhp
index 1206beb78d..1206beb78d 100755..100644
--- a/helpcontent2/source/text/scalc/01/12070100.xhp
+++ b/helpcontent2/source/text/scalc/01/12070100.xhp
diff --git a/helpcontent2/source/text/scalc/01/12080000.xhp b/helpcontent2/source/text/scalc/01/12080000.xhp
index bcc563e715..bcc563e715 100755..100644
--- a/helpcontent2/source/text/scalc/01/12080000.xhp
+++ b/helpcontent2/source/text/scalc/01/12080000.xhp
diff --git a/helpcontent2/source/text/scalc/01/12090000.xhp b/helpcontent2/source/text/scalc/01/12090000.xhp
index 377869e05e..377869e05e 100755..100644
--- a/helpcontent2/source/text/scalc/01/12090000.xhp
+++ b/helpcontent2/source/text/scalc/01/12090000.xhp
diff --git a/helpcontent2/source/text/scalc/01/12090101.xhp b/helpcontent2/source/text/scalc/01/12090101.xhp
index a6739bc7bd..a6739bc7bd 100755..100644
--- a/helpcontent2/source/text/scalc/01/12090101.xhp
+++ b/helpcontent2/source/text/scalc/01/12090101.xhp
diff --git a/helpcontent2/source/text/scalc/01/12090103.xhp b/helpcontent2/source/text/scalc/01/12090103.xhp
index 08a6f34ebd..08a6f34ebd 100755..100644
--- a/helpcontent2/source/text/scalc/01/12090103.xhp
+++ b/helpcontent2/source/text/scalc/01/12090103.xhp
diff --git a/helpcontent2/source/text/scalc/01/12090104.xhp b/helpcontent2/source/text/scalc/01/12090104.xhp
index 8571f66f47..8571f66f47 100755..100644
--- a/helpcontent2/source/text/scalc/01/12090104.xhp
+++ b/helpcontent2/source/text/scalc/01/12090104.xhp
diff --git a/helpcontent2/source/text/scalc/01/12090105.xhp b/helpcontent2/source/text/scalc/01/12090105.xhp
index 5484d260e7..5484d260e7 100755..100644
--- a/helpcontent2/source/text/scalc/01/12090105.xhp
+++ b/helpcontent2/source/text/scalc/01/12090105.xhp
diff --git a/helpcontent2/source/text/scalc/01/12090106.xhp b/helpcontent2/source/text/scalc/01/12090106.xhp
index 842d7bb1e3..842d7bb1e3 100755..100644
--- a/helpcontent2/source/text/scalc/01/12090106.xhp
+++ b/helpcontent2/source/text/scalc/01/12090106.xhp
diff --git a/helpcontent2/source/text/scalc/01/12090400.xhp b/helpcontent2/source/text/scalc/01/12090400.xhp
index 6337482c43..6337482c43 100755..100644
--- a/helpcontent2/source/text/scalc/01/12090400.xhp
+++ b/helpcontent2/source/text/scalc/01/12090400.xhp
diff --git a/helpcontent2/source/text/scalc/01/12120100.xhp b/helpcontent2/source/text/scalc/01/12120100.xhp
index a35994c324..a35994c324 100755..100644
--- a/helpcontent2/source/text/scalc/01/12120100.xhp
+++ b/helpcontent2/source/text/scalc/01/12120100.xhp
diff --git a/helpcontent2/source/text/scalc/01/12120300.xhp b/helpcontent2/source/text/scalc/01/12120300.xhp
index bb3e3d652c..bb3e3d652c 100755..100644
--- a/helpcontent2/source/text/scalc/01/12120300.xhp
+++ b/helpcontent2/source/text/scalc/01/12120300.xhp
diff --git a/helpcontent2/source/text/scalc/01/format_graphic.xhp b/helpcontent2/source/text/scalc/01/format_graphic.xhp
index 5076e1b00a..5076e1b00a 100755..100644
--- a/helpcontent2/source/text/scalc/01/format_graphic.xhp
+++ b/helpcontent2/source/text/scalc/01/format_graphic.xhp
diff --git a/helpcontent2/source/text/scalc/02/02130000.xhp b/helpcontent2/source/text/scalc/02/02130000.xhp
index 3638b1e1d0..c8ba0e12ff 100644
--- a/helpcontent2/source/text/scalc/02/02130000.xhp
+++ b/helpcontent2/source/text/scalc/02/02130000.xhp
@@ -52,7 +52,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3155267" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_currencyfield.png" id="img_id3159096"><alt xml-lang="en-US" id="alt_id3159096">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3155267" xml-lang="en-US" oldref=""><image src="cmd/sc_currencyfield.png" id="img_id3159096"><alt xml-lang="en-US" id="alt_id3159096">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3150214" l10n="U" xml-lang="en-US" oldref="3">Number Format: Currency</paragraph>
diff --git a/helpcontent2/source/text/scalc/02/02140000.xhp b/helpcontent2/source/text/scalc/02/02140000.xhp
index cdb0afaabd..d1164d563e 100644
--- a/helpcontent2/source/text/scalc/02/02140000.xhp
+++ b/helpcontent2/source/text/scalc/02/02140000.xhp
@@ -51,7 +51,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153968" xml-lang="en-US" l10n="E">
-<image id="img_id3150869" src="res/commandimagelist/sc_numberformatpercent.png" width="5.64mm" height="5.64mm"><alt id="alt_id3150869" xml-lang="en-US">Icon</alt>
+<image id="img_id3150869" src="cmd/sc_numberformatpercent.png" width="5.64mm" height="5.64mm"><alt id="alt_id3150869" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/scalc/02/02150000.xhp b/helpcontent2/source/text/scalc/02/02150000.xhp
index 9bb3512321..030af54843 100644
--- a/helpcontent2/source/text/scalc/02/02150000.xhp
+++ b/helpcontent2/source/text/scalc/02/02150000.xhp
@@ -52,7 +52,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3155922" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_numberformatstandard.png" id="img_id3156024"><alt xml-lang="en-US" id="alt_id3156024">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3155922" xml-lang="en-US" oldref=""><image src="cmd/sc_numberformatstandard.png" id="img_id3156024"><alt xml-lang="en-US" id="alt_id3156024">Icon</alt></image></paragraph>
 
      </tablecell>
      <tablecell>
diff --git a/helpcontent2/source/text/scalc/02/02160000.xhp b/helpcontent2/source/text/scalc/02/02160000.xhp
index a611c3eeae..780596d817 100644
--- a/helpcontent2/source/text/scalc/02/02160000.xhp
+++ b/helpcontent2/source/text/scalc/02/02160000.xhp
@@ -53,7 +53,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145787" xml-lang="en-US" l10n="E">
-<image id="img_id3145271" src="res/commandimagelist/sc_numberformatincdecimals.png" width="5.64mm" height="5.64mm"><alt id="alt_id3145271" xml-lang="en-US">Icon</alt>
+<image id="img_id3145271" src="cmd/sc_numberformatincdecimals.png" width="5.64mm" height="5.64mm"><alt id="alt_id3145271" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/scalc/02/02170000.xhp b/helpcontent2/source/text/scalc/02/02170000.xhp
index d60facf42f..18af1208d5 100644
--- a/helpcontent2/source/text/scalc/02/02170000.xhp
+++ b/helpcontent2/source/text/scalc/02/02170000.xhp
@@ -53,7 +53,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145173" xml-lang="en-US" l10n="E">
-<image id="img_id3153192" src="res/commandimagelist/sc_numberformatdecdecimals.png" width="5.64mm" height="5.64mm"><alt id="alt_id3153192" xml-lang="en-US">Icon</alt>
+<image id="img_id3153192" src="cmd/sc_numberformatdecdecimals.png" width="5.64mm" height="5.64mm"><alt id="alt_id3153192" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/scalc/02/06030000.xhp b/helpcontent2/source/text/scalc/02/06030000.xhp
index d192a85335..5d2fea7f33 100644
--- a/helpcontent2/source/text/scalc/02/06030000.xhp
+++ b/helpcontent2/source/text/scalc/02/06030000.xhp
@@ -53,7 +53,7 @@
             <tablerow>
                <tablecell>
                   <paragraph xml-lang="en-US" id="par_id3153770" role="paragraph" l10n="E">
-<image id="img_id3147434" src="res/commandimagelist/sc_autosum.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3147434">Icon</alt>
+<image id="img_id3147434" src="cmd/sc_autosum.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3147434">Icon</alt>
 	</image></paragraph>
                </tablecell>
                <tablecell>
diff --git a/helpcontent2/source/text/scalc/02/06080000.xhp b/helpcontent2/source/text/scalc/02/06080000.xhp
index 192d8fd502..a3747180b2 100644
--- a/helpcontent2/source/text/scalc/02/06080000.xhp
+++ b/helpcontent2/source/text/scalc/02/06080000.xhp
@@ -50,7 +50,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155132" xml-lang="en-US" l10n="E">
-<image id="img_id3145785" src="res/commandimagelist/sc_choosedesign.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145785" xml-lang="en-US">Icon</alt>
+<image id="img_id3145785" src="cmd/sc_choosedesign.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145785" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/scalc/02/10050000.xhp b/helpcontent2/source/text/scalc/02/10050000.xhp
index 3b9f5fc605..faebc2474d 100644
--- a/helpcontent2/source/text/scalc/02/10050000.xhp
+++ b/helpcontent2/source/text/scalc/02/10050000.xhp
@@ -58,7 +58,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155854" xml-lang="en-US" l10n="E">
-<image id="img_id3151116" src="res/commandimagelist/sc_helpzoomin.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151116" xml-lang="en-US">Icon</alt>
+<image id="img_id3151116" src="cmd/sc_helpzoomin.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151116" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/scalc/02/10060000.xhp b/helpcontent2/source/text/scalc/02/10060000.xhp
index 13b6a4a244..dc683a1cc8 100644
--- a/helpcontent2/source/text/scalc/02/10060000.xhp
+++ b/helpcontent2/source/text/scalc/02/10060000.xhp
@@ -57,7 +57,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153770" xml-lang="en-US" l10n="E">
-<image id="img_id3155131" src="res/commandimagelist/sc_zoomout.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155131" xml-lang="en-US">Icon</alt>
+<image id="img_id3155131" src="cmd/sc_zoomout.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155131" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/scalc/02/18010000.xhp b/helpcontent2/source/text/scalc/02/18010000.xhp
index ad996bed1f..bc5256f426 100644
--- a/helpcontent2/source/text/scalc/02/18010000.xhp
+++ b/helpcontent2/source/text/scalc/02/18010000.xhp
@@ -53,7 +53,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150767" xml-lang="en-US" l10n="E">
-<image id="img_id3156423" src="res/commandimagelist/sc_insertgraphic.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156423" xml-lang="en-US">Icon</alt>
+<image id="img_id3156423" src="cmd/sc_insertgraphic.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156423" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/scalc/04/01020000.xhp b/helpcontent2/source/text/scalc/04/01020000.xhp
index 71a0d715ed..71a0d715ed 100755..100644
--- a/helpcontent2/source/text/scalc/04/01020000.xhp
+++ b/helpcontent2/source/text/scalc/04/01020000.xhp
diff --git a/helpcontent2/source/text/scalc/05/02140000.xhp b/helpcontent2/source/text/scalc/05/02140000.xhp
index b08e14dd0f..b08e14dd0f 100755..100644
--- a/helpcontent2/source/text/scalc/05/02140000.xhp
+++ b/helpcontent2/source/text/scalc/05/02140000.xhp
diff --git a/helpcontent2/source/text/scalc/guide/auto_off.xhp b/helpcontent2/source/text/scalc/guide/auto_off.xhp
index f1cf074dbc..f1cf074dbc 100755..100644
--- a/helpcontent2/source/text/scalc/guide/auto_off.xhp
+++ b/helpcontent2/source/text/scalc/guide/auto_off.xhp
diff --git a/helpcontent2/source/text/scalc/guide/autofilter.xhp b/helpcontent2/source/text/scalc/guide/autofilter.xhp
index e40c34691d..e40c34691d 100755..100644
--- a/helpcontent2/source/text/scalc/guide/autofilter.xhp
+++ b/helpcontent2/source/text/scalc/guide/autofilter.xhp
diff --git a/helpcontent2/source/text/scalc/guide/autoformat.xhp b/helpcontent2/source/text/scalc/guide/autoformat.xhp
index 098de25ffa..f8d211c44e 100755..100644
--- a/helpcontent2/source/text/scalc/guide/autoformat.xhp
+++ b/helpcontent2/source/text/scalc/guide/autoformat.xhp
@@ -10,9 +10,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/scalc/guide/borders.xhp b/helpcontent2/source/text/scalc/guide/borders.xhp
index 160840f2b5..160840f2b5 100755..100644
--- a/helpcontent2/source/text/scalc/guide/borders.xhp
+++ b/helpcontent2/source/text/scalc/guide/borders.xhp
diff --git a/helpcontent2/source/text/scalc/guide/calc_date.xhp b/helpcontent2/source/text/scalc/guide/calc_date.xhp
index 9830134a81..9830134a81 100755..100644
--- a/helpcontent2/source/text/scalc/guide/calc_date.xhp
+++ b/helpcontent2/source/text/scalc/guide/calc_date.xhp
diff --git a/helpcontent2/source/text/scalc/guide/calc_series.xhp b/helpcontent2/source/text/scalc/guide/calc_series.xhp
index b3642f22d4..b3642f22d4 100755..100644
--- a/helpcontent2/source/text/scalc/guide/calc_series.xhp
+++ b/helpcontent2/source/text/scalc/guide/calc_series.xhp
diff --git a/helpcontent2/source/text/scalc/guide/calc_timevalues.xhp b/helpcontent2/source/text/scalc/guide/calc_timevalues.xhp
index c799c3504f..c799c3504f 100755..100644
--- a/helpcontent2/source/text/scalc/guide/calc_timevalues.xhp
+++ b/helpcontent2/source/text/scalc/guide/calc_timevalues.xhp
diff --git a/helpcontent2/source/text/scalc/guide/cell_protect.xhp b/helpcontent2/source/text/scalc/guide/cell_protect.xhp
index 1582ea1a25..1582ea1a25 100755..100644
--- a/helpcontent2/source/text/scalc/guide/cell_protect.xhp
+++ b/helpcontent2/source/text/scalc/guide/cell_protect.xhp
diff --git a/helpcontent2/source/text/scalc/guide/cell_unprotect.xhp b/helpcontent2/source/text/scalc/guide/cell_unprotect.xhp
index 2b72611e8c..2b72611e8c 100755..100644
--- a/helpcontent2/source/text/scalc/guide/cell_unprotect.xhp
+++ b/helpcontent2/source/text/scalc/guide/cell_unprotect.xhp
diff --git a/helpcontent2/source/text/scalc/guide/cellcopy.xhp b/helpcontent2/source/text/scalc/guide/cellcopy.xhp
index fff3be6b36..fff3be6b36 100755..100644
--- a/helpcontent2/source/text/scalc/guide/cellcopy.xhp
+++ b/helpcontent2/source/text/scalc/guide/cellcopy.xhp
diff --git a/helpcontent2/source/text/scalc/guide/cellreference_dragdrop.xhp b/helpcontent2/source/text/scalc/guide/cellreference_dragdrop.xhp
index c83c804d28..c83c804d28 100755..100644
--- a/helpcontent2/source/text/scalc/guide/cellreference_dragdrop.xhp
+++ b/helpcontent2/source/text/scalc/guide/cellreference_dragdrop.xhp
diff --git a/helpcontent2/source/text/scalc/guide/cellreferences.xhp b/helpcontent2/source/text/scalc/guide/cellreferences.xhp
index 8764d32055..8764d32055 100755..100644
--- a/helpcontent2/source/text/scalc/guide/cellreferences.xhp
+++ b/helpcontent2/source/text/scalc/guide/cellreferences.xhp
diff --git a/helpcontent2/source/text/scalc/guide/cellreferences_url.xhp b/helpcontent2/source/text/scalc/guide/cellreferences_url.xhp
index 39513f1d72..39513f1d72 100755..100644
--- a/helpcontent2/source/text/scalc/guide/cellreferences_url.xhp
+++ b/helpcontent2/source/text/scalc/guide/cellreferences_url.xhp
diff --git a/helpcontent2/source/text/scalc/guide/cellstyle_by_formula.xhp b/helpcontent2/source/text/scalc/guide/cellstyle_by_formula.xhp
index 5a2726974a..5a2726974a 100755..100644
--- a/helpcontent2/source/text/scalc/guide/cellstyle_by_formula.xhp
+++ b/helpcontent2/source/text/scalc/guide/cellstyle_by_formula.xhp
diff --git a/helpcontent2/source/text/scalc/guide/cellstyle_conditional.xhp b/helpcontent2/source/text/scalc/guide/cellstyle_conditional.xhp
index 1c1d38d508..1c1d38d508 100755..100644
--- a/helpcontent2/source/text/scalc/guide/cellstyle_conditional.xhp
+++ b/helpcontent2/source/text/scalc/guide/cellstyle_conditional.xhp
diff --git a/helpcontent2/source/text/scalc/guide/cellstyle_minusvalue.xhp b/helpcontent2/source/text/scalc/guide/cellstyle_minusvalue.xhp
index a133ce25b3..a133ce25b3 100755..100644
--- a/helpcontent2/source/text/scalc/guide/cellstyle_minusvalue.xhp
+++ b/helpcontent2/source/text/scalc/guide/cellstyle_minusvalue.xhp
diff --git a/helpcontent2/source/text/scalc/guide/consolidate.xhp b/helpcontent2/source/text/scalc/guide/consolidate.xhp
index 8e73e02e12..8e73e02e12 100755..100644
--- a/helpcontent2/source/text/scalc/guide/consolidate.xhp
+++ b/helpcontent2/source/text/scalc/guide/consolidate.xhp
diff --git a/helpcontent2/source/text/scalc/guide/csv_files.xhp b/helpcontent2/source/text/scalc/guide/csv_files.xhp
index 5fc3c3f65c..5fc3c3f65c 100755..100644
--- a/helpcontent2/source/text/scalc/guide/csv_files.xhp
+++ b/helpcontent2/source/text/scalc/guide/csv_files.xhp
diff --git a/helpcontent2/source/text/scalc/guide/csv_formula.xhp b/helpcontent2/source/text/scalc/guide/csv_formula.xhp
index 6c044c60b7..6c044c60b7 100755..100644
--- a/helpcontent2/source/text/scalc/guide/csv_formula.xhp
+++ b/helpcontent2/source/text/scalc/guide/csv_formula.xhp
diff --git a/helpcontent2/source/text/scalc/guide/currency_format.xhp b/helpcontent2/source/text/scalc/guide/currency_format.xhp
index d1c8b1ecd0..ac40cf2bfd 100644
--- a/helpcontent2/source/text/scalc/guide/currency_format.xhp
+++ b/helpcontent2/source/text/scalc/guide/currency_format.xhp
@@ -50,7 +50,7 @@
 oldref="46"><variable id="currency_format"><link href="text/scalc/guide/currency_format.xhp" name="Cells in Currency Format">Cells in Currency Format</link>
 </variable></paragraph>
 <paragraph xml-lang="en-US" id="par_id3153968" role="paragraph" l10n="CHG" oldref="47">In <item type="productname">%PRODUCTNAME</item> Calc you can give numbers any currency format. When you click the <item type="menuitem">Currency</item> icon 
-<image id="img_id3150791" src="res/commandimagelist/sc_currencyfield.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3150791">Icon</alt>
+<image id="img_id3150791" src="cmd/sc_currencyfield.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3150791">Icon</alt>
 </image> in the <item type="menuitem">Formatting</item> bar to format a number, the cell is given the default currency format set under <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</item>.</paragraph>
 <paragraph xml-lang="en-US" id="par_id3150010" role="note" l10n="CHG" oldref="48">Exchanging of <item type="productname">%PRODUCTNAME</item> Calc documents can lead to misunderstandings, if your <item type="productname">%PRODUCTNAME</item> Calc document is loaded by a user who uses a different default currency format.</paragraph>
 <paragraph xml-lang="en-US" id="par_id3156442" role="paragraph" l10n="U" oldref="52">In <item type="productname">%PRODUCTNAME</item> Calc you can define that a number that you have formatted as "1,234.50 €", still remains in euros in another country and does not become dollars.</paragraph>
diff --git a/helpcontent2/source/text/scalc/guide/database_define.xhp b/helpcontent2/source/text/scalc/guide/database_define.xhp
index 976f04faa3..976f04faa3 100755..100644
--- a/helpcontent2/source/text/scalc/guide/database_define.xhp
+++ b/helpcontent2/source/text/scalc/guide/database_define.xhp
diff --git a/helpcontent2/source/text/scalc/guide/database_filter.xhp b/helpcontent2/source/text/scalc/guide/database_filter.xhp
index ef57d19561..ef57d19561 100755..100644
--- a/helpcontent2/source/text/scalc/guide/database_filter.xhp
+++ b/helpcontent2/source/text/scalc/guide/database_filter.xhp
diff --git a/helpcontent2/source/text/scalc/guide/database_sort.xhp b/helpcontent2/source/text/scalc/guide/database_sort.xhp
index 477bf7a1ba..477bf7a1ba 100755..100644
--- a/helpcontent2/source/text/scalc/guide/database_sort.xhp
+++ b/helpcontent2/source/text/scalc/guide/database_sort.xhp
diff --git a/helpcontent2/source/text/scalc/guide/datapilot.xhp b/helpcontent2/source/text/scalc/guide/datapilot.xhp
index 7a8ff0a1a9..7a8ff0a1a9 100755..100644
--- a/helpcontent2/source/text/scalc/guide/datapilot.xhp
+++ b/helpcontent2/source/text/scalc/guide/datapilot.xhp
diff --git a/helpcontent2/source/text/scalc/guide/datapilot_createtable.xhp b/helpcontent2/source/text/scalc/guide/datapilot_createtable.xhp
index 1a6be7babf..1a6be7babf 100755..100644
--- a/helpcontent2/source/text/scalc/guide/datapilot_createtable.xhp
+++ b/helpcontent2/source/text/scalc/guide/datapilot_createtable.xhp
diff --git a/helpcontent2/source/text/scalc/guide/datapilot_deletetable.xhp b/helpcontent2/source/text/scalc/guide/datapilot_deletetable.xhp
index ee9fe95802..ee9fe95802 100755..100644
--- a/helpcontent2/source/text/scalc/guide/datapilot_deletetable.xhp
+++ b/helpcontent2/source/text/scalc/guide/datapilot_deletetable.xhp
diff --git a/helpcontent2/source/text/scalc/guide/datapilot_grouping.xhp b/helpcontent2/source/text/scalc/guide/datapilot_grouping.xhp
index 254374ea0f..254374ea0f 100755..100644
--- a/helpcontent2/source/text/scalc/guide/datapilot_grouping.xhp
+++ b/helpcontent2/source/text/scalc/guide/datapilot_grouping.xhp
diff --git a/helpcontent2/source/text/scalc/guide/datapilot_tipps.xhp b/helpcontent2/source/text/scalc/guide/datapilot_tipps.xhp
index 8cebe609b0..8cebe609b0 100755..100644
--- a/helpcontent2/source/text/scalc/guide/datapilot_tipps.xhp
+++ b/helpcontent2/source/text/scalc/guide/datapilot_tipps.xhp
diff --git a/helpcontent2/source/text/scalc/guide/datapilot_updatetable.xhp b/helpcontent2/source/text/scalc/guide/datapilot_updatetable.xhp
index da16c04b43..da16c04b43 100755..100644
--- a/helpcontent2/source/text/scalc/guide/datapilot_updatetable.xhp
+++ b/helpcontent2/source/text/scalc/guide/datapilot_updatetable.xhp
diff --git a/helpcontent2/source/text/scalc/guide/dbase_files.xhp b/helpcontent2/source/text/scalc/guide/dbase_files.xhp
index e8e501dc5a..e8e501dc5a 100755..100644
--- a/helpcontent2/source/text/scalc/guide/dbase_files.xhp
+++ b/helpcontent2/source/text/scalc/guide/dbase_files.xhp
diff --git a/helpcontent2/source/text/scalc/guide/edit_multitables.xhp b/helpcontent2/source/text/scalc/guide/edit_multitables.xhp
index a46d8a26ad..a46d8a26ad 100755..100644
--- a/helpcontent2/source/text/scalc/guide/edit_multitables.xhp
+++ b/helpcontent2/source/text/scalc/guide/edit_multitables.xhp
diff --git a/helpcontent2/source/text/scalc/guide/filters.xhp b/helpcontent2/source/text/scalc/guide/filters.xhp
index a1c68a1c89..a1c68a1c89 100755..100644
--- a/helpcontent2/source/text/scalc/guide/filters.xhp
+++ b/helpcontent2/source/text/scalc/guide/filters.xhp
diff --git a/helpcontent2/source/text/scalc/guide/format_table.xhp b/helpcontent2/source/text/scalc/guide/format_table.xhp
index c71896440c..c71896440c 100755..100644
--- a/helpcontent2/source/text/scalc/guide/format_table.xhp
+++ b/helpcontent2/source/text/scalc/guide/format_table.xhp
diff --git a/helpcontent2/source/text/scalc/guide/format_value.xhp b/helpcontent2/source/text/scalc/guide/format_value.xhp
index 0ef456f6e1..4419bcf90e 100644
--- a/helpcontent2/source/text/scalc/guide/format_value.xhp
+++ b/helpcontent2/source/text/scalc/guide/format_value.xhp
@@ -65,7 +65,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3155766" role="paragraph" l10n="E">
-<image id="img_id3149021" src="res/commandimagelist/sc_numberformatincdecimals.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3149021">Icon</alt>
+<image id="img_id3149021" src="cmd/sc_numberformatincdecimals.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3149021">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
diff --git a/helpcontent2/source/text/scalc/guide/format_value_userdef.xhp b/helpcontent2/source/text/scalc/guide/format_value_userdef.xhp
index 4775ce3511..4775ce3511 100755..100644
--- a/helpcontent2/source/text/scalc/guide/format_value_userdef.xhp
+++ b/helpcontent2/source/text/scalc/guide/format_value_userdef.xhp
diff --git a/helpcontent2/source/text/scalc/guide/formula_copy.xhp b/helpcontent2/source/text/scalc/guide/formula_copy.xhp
index 2719af67ca..2719af67ca 100755..100644
--- a/helpcontent2/source/text/scalc/guide/formula_copy.xhp
+++ b/helpcontent2/source/text/scalc/guide/formula_copy.xhp
diff --git a/helpcontent2/source/text/scalc/guide/formula_value.xhp b/helpcontent2/source/text/scalc/guide/formula_value.xhp
index fc32f100e6..fc32f100e6 100755..100644
--- a/helpcontent2/source/text/scalc/guide/formula_value.xhp
+++ b/helpcontent2/source/text/scalc/guide/formula_value.xhp
diff --git a/helpcontent2/source/text/scalc/guide/fraction_enter.xhp b/helpcontent2/source/text/scalc/guide/fraction_enter.xhp
index 4e62bfa517..4e62bfa517 100755..100644
--- a/helpcontent2/source/text/scalc/guide/fraction_enter.xhp
+++ b/helpcontent2/source/text/scalc/guide/fraction_enter.xhp
diff --git a/helpcontent2/source/text/scalc/guide/goalseek.xhp b/helpcontent2/source/text/scalc/guide/goalseek.xhp
index a3b04f7ebc..a3b04f7ebc 100755..100644
--- a/helpcontent2/source/text/scalc/guide/goalseek.xhp
+++ b/helpcontent2/source/text/scalc/guide/goalseek.xhp
diff --git a/helpcontent2/source/text/scalc/guide/html_doc.xhp b/helpcontent2/source/text/scalc/guide/html_doc.xhp
index d9d8d855ba..d9d8d855ba 100755..100644
--- a/helpcontent2/source/text/scalc/guide/html_doc.xhp
+++ b/helpcontent2/source/text/scalc/guide/html_doc.xhp
diff --git a/helpcontent2/source/text/scalc/guide/integer_leading_zero.xhp b/helpcontent2/source/text/scalc/guide/integer_leading_zero.xhp
index f967cd0cb4..f967cd0cb4 100755..100644
--- a/helpcontent2/source/text/scalc/guide/integer_leading_zero.xhp
+++ b/helpcontent2/source/text/scalc/guide/integer_leading_zero.xhp
diff --git a/helpcontent2/source/text/scalc/guide/main.xhp b/helpcontent2/source/text/scalc/guide/main.xhp
index 8d23ff37ed..8d23ff37ed 100755..100644
--- a/helpcontent2/source/text/scalc/guide/main.xhp
+++ b/helpcontent2/source/text/scalc/guide/main.xhp
diff --git a/helpcontent2/source/text/scalc/guide/mark_cells.xhp b/helpcontent2/source/text/scalc/guide/mark_cells.xhp
index b08450811c..b08450811c 100755..100644
--- a/helpcontent2/source/text/scalc/guide/mark_cells.xhp
+++ b/helpcontent2/source/text/scalc/guide/mark_cells.xhp
diff --git a/helpcontent2/source/text/scalc/guide/matrixformula.xhp b/helpcontent2/source/text/scalc/guide/matrixformula.xhp
index 7f93022c8b..7f93022c8b 100755..100644
--- a/helpcontent2/source/text/scalc/guide/matrixformula.xhp
+++ b/helpcontent2/source/text/scalc/guide/matrixformula.xhp
diff --git a/helpcontent2/source/text/scalc/guide/multioperation.xhp b/helpcontent2/source/text/scalc/guide/multioperation.xhp
index 6a0b5cfff8..6a0b5cfff8 100755..100644
--- a/helpcontent2/source/text/scalc/guide/multioperation.xhp
+++ b/helpcontent2/source/text/scalc/guide/multioperation.xhp
diff --git a/helpcontent2/source/text/scalc/guide/print_details.xhp b/helpcontent2/source/text/scalc/guide/print_details.xhp
index 048ff87505..048ff87505 100755..100644
--- a/helpcontent2/source/text/scalc/guide/print_details.xhp
+++ b/helpcontent2/source/text/scalc/guide/print_details.xhp
diff --git a/helpcontent2/source/text/scalc/guide/print_exact.xhp b/helpcontent2/source/text/scalc/guide/print_exact.xhp
index 0f25f2b7bf..0f25f2b7bf 100755..100644
--- a/helpcontent2/source/text/scalc/guide/print_exact.xhp
+++ b/helpcontent2/source/text/scalc/guide/print_exact.xhp
diff --git a/helpcontent2/source/text/scalc/guide/print_landscape.xhp b/helpcontent2/source/text/scalc/guide/print_landscape.xhp
index 71dea28b32..71dea28b32 100755..100644
--- a/helpcontent2/source/text/scalc/guide/print_landscape.xhp
+++ b/helpcontent2/source/text/scalc/guide/print_landscape.xhp
diff --git a/helpcontent2/source/text/scalc/guide/printranges.xhp b/helpcontent2/source/text/scalc/guide/printranges.xhp
index 611b298cd4..611b298cd4 100755..100644
--- a/helpcontent2/source/text/scalc/guide/printranges.xhp
+++ b/helpcontent2/source/text/scalc/guide/printranges.xhp
diff --git a/helpcontent2/source/text/scalc/guide/rename_table.xhp b/helpcontent2/source/text/scalc/guide/rename_table.xhp
index b80c07a946..d629b1df7e 100644
--- a/helpcontent2/source/text/scalc/guide/rename_table.xhp
+++ b/helpcontent2/source/text/scalc/guide/rename_table.xhp
@@ -99,4 +99,4 @@
          <embed href="text/scalc/guide/multitables.xhp#multitables"/>
       </section>
    </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/scalc/guide/rounding_numbers.xhp b/helpcontent2/source/text/scalc/guide/rounding_numbers.xhp
index 55359b79c4..55359b79c4 100755..100644
--- a/helpcontent2/source/text/scalc/guide/rounding_numbers.xhp
+++ b/helpcontent2/source/text/scalc/guide/rounding_numbers.xhp
diff --git a/helpcontent2/source/text/scalc/guide/scenario.xhp b/helpcontent2/source/text/scalc/guide/scenario.xhp
index a9ff0be2ef..fe889eef44 100755..100644
--- a/helpcontent2/source/text/scalc/guide/scenario.xhp
+++ b/helpcontent2/source/text/scalc/guide/scenario.xhp
@@ -63,7 +63,7 @@
 <list type="ordered">
 <listitem>
 <paragraph role="listitem" id="par_id3150752" xml-lang="en-US" l10n="CHG" oldref="12">Open the Navigator with the <emph>Navigator</emph> icon 
-<image id="img_id1593676" src="res/commandimagelist/sc_navigator.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id1593676" xml-lang="en-US">Navigator icon</alt>
+<image id="img_id1593676" src="cmd/sc_navigator.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id1593676" xml-lang="en-US">Navigator icon</alt>
 	</image> on the Standard bar.</paragraph>
 </listitem>
 <listitem>
diff --git a/helpcontent2/source/text/scalc/guide/sorted_list.xhp b/helpcontent2/source/text/scalc/guide/sorted_list.xhp
index b880cbf662..b880cbf662 100755..100644
--- a/helpcontent2/source/text/scalc/guide/sorted_list.xhp
+++ b/helpcontent2/source/text/scalc/guide/sorted_list.xhp
diff --git a/helpcontent2/source/text/scalc/guide/specialfilter.xhp b/helpcontent2/source/text/scalc/guide/specialfilter.xhp
index 2f92baf085..2f92baf085 100755..100644
--- a/helpcontent2/source/text/scalc/guide/specialfilter.xhp
+++ b/helpcontent2/source/text/scalc/guide/specialfilter.xhp
diff --git a/helpcontent2/source/text/scalc/guide/super_subscript.xhp b/helpcontent2/source/text/scalc/guide/super_subscript.xhp
index d58aaa4734..d58aaa4734 100755..100644
--- a/helpcontent2/source/text/scalc/guide/super_subscript.xhp
+++ b/helpcontent2/source/text/scalc/guide/super_subscript.xhp
diff --git a/helpcontent2/source/text/scalc/guide/table_rotate.xhp b/helpcontent2/source/text/scalc/guide/table_rotate.xhp
index 70c48ca5eb..70c48ca5eb 100755..100644
--- a/helpcontent2/source/text/scalc/guide/table_rotate.xhp
+++ b/helpcontent2/source/text/scalc/guide/table_rotate.xhp
diff --git a/helpcontent2/source/text/scalc/guide/table_view.xhp b/helpcontent2/source/text/scalc/guide/table_view.xhp
index 8413a2640f..8413a2640f 100755..100644
--- a/helpcontent2/source/text/scalc/guide/table_view.xhp
+++ b/helpcontent2/source/text/scalc/guide/table_view.xhp
diff --git a/helpcontent2/source/text/scalc/guide/text_rotate.xhp b/helpcontent2/source/text/scalc/guide/text_rotate.xhp
index 634bf62801..6e9673f4b2 100755..100644
--- a/helpcontent2/source/text/scalc/guide/text_rotate.xhp
+++ b/helpcontent2/source/text/scalc/guide/text_rotate.xhp
@@ -63,4 +63,4 @@
          <paragraph xml-lang="en-US" id="par_id3154944" role="paragraph" l10n="U" oldref="8"><link href="text/shared/01/05340300.xhp" name="Format - Cells - Alignment">Format - Cells - Alignment</link></paragraph>
       </section>
    </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/scalc/guide/text_wrap.xhp b/helpcontent2/source/text/scalc/guide/text_wrap.xhp
index 8c66ddf8dd..8c66ddf8dd 100755..100644
--- a/helpcontent2/source/text/scalc/guide/text_wrap.xhp
+++ b/helpcontent2/source/text/scalc/guide/text_wrap.xhp
diff --git a/helpcontent2/source/text/scalc/guide/userdefined_function.xhp b/helpcontent2/source/text/scalc/guide/userdefined_function.xhp
index 9df4f2b191..9df4f2b191 100755..100644
--- a/helpcontent2/source/text/scalc/guide/userdefined_function.xhp
+++ b/helpcontent2/source/text/scalc/guide/userdefined_function.xhp
diff --git a/helpcontent2/source/text/scalc/guide/validity.xhp b/helpcontent2/source/text/scalc/guide/validity.xhp
index e186748c8b..e186748c8b 100755..100644
--- a/helpcontent2/source/text/scalc/guide/validity.xhp
+++ b/helpcontent2/source/text/scalc/guide/validity.xhp
diff --git a/helpcontent2/source/text/scalc/guide/value_with_name.xhp b/helpcontent2/source/text/scalc/guide/value_with_name.xhp
index 5cb9169e04..5cb9169e04 100755..100644
--- a/helpcontent2/source/text/scalc/guide/value_with_name.xhp
+++ b/helpcontent2/source/text/scalc/guide/value_with_name.xhp
diff --git a/helpcontent2/source/text/scalc/guide/year2000.xhp b/helpcontent2/source/text/scalc/guide/year2000.xhp
index d206d791cc..d206d791cc 100755..100644
--- a/helpcontent2/source/text/scalc/guide/year2000.xhp
+++ b/helpcontent2/source/text/scalc/guide/year2000.xhp
diff --git a/helpcontent2/source/text/scalc/main0100.xhp b/helpcontent2/source/text/scalc/main0100.xhp
index a31ccfc580..a31ccfc580 100755..100644
--- a/helpcontent2/source/text/scalc/main0100.xhp
+++ b/helpcontent2/source/text/scalc/main0100.xhp
diff --git a/helpcontent2/source/text/scalc/main0101.xhp b/helpcontent2/source/text/scalc/main0101.xhp
index 46a31e7a59..46a31e7a59 100755..100644
--- a/helpcontent2/source/text/scalc/main0101.xhp
+++ b/helpcontent2/source/text/scalc/main0101.xhp
diff --git a/helpcontent2/source/text/scalc/main0102.xhp b/helpcontent2/source/text/scalc/main0102.xhp
index 79a4f5ee11..79a4f5ee11 100755..100644
--- a/helpcontent2/source/text/scalc/main0102.xhp
+++ b/helpcontent2/source/text/scalc/main0102.xhp
diff --git a/helpcontent2/source/text/scalc/main0104.xhp b/helpcontent2/source/text/scalc/main0104.xhp
index 53c8713852..53c8713852 100755..100644
--- a/helpcontent2/source/text/scalc/main0104.xhp
+++ b/helpcontent2/source/text/scalc/main0104.xhp
diff --git a/helpcontent2/source/text/scalc/main0106.xhp b/helpcontent2/source/text/scalc/main0106.xhp
index cde47c5965..cde47c5965 100755..100644
--- a/helpcontent2/source/text/scalc/main0106.xhp
+++ b/helpcontent2/source/text/scalc/main0106.xhp
diff --git a/helpcontent2/source/text/scalc/main0107.xhp b/helpcontent2/source/text/scalc/main0107.xhp
index 6a5c2786ec..6a5c2786ec 100755..100644
--- a/helpcontent2/source/text/scalc/main0107.xhp
+++ b/helpcontent2/source/text/scalc/main0107.xhp
diff --git a/helpcontent2/source/text/scalc/main0112.xhp b/helpcontent2/source/text/scalc/main0112.xhp
index 3316380e78..3316380e78 100755..100644
--- a/helpcontent2/source/text/scalc/main0112.xhp
+++ b/helpcontent2/source/text/scalc/main0112.xhp
diff --git a/helpcontent2/source/text/scalc/main0200.xhp b/helpcontent2/source/text/scalc/main0200.xhp
index 0d2f9c370b..9a33ce9b77 100755..100644
--- a/helpcontent2/source/text/scalc/main0200.xhp
+++ b/helpcontent2/source/text/scalc/main0200.xhp
@@ -76,9 +76,6 @@
 <section id="Section9">
 <embed href="text/scalc/main0210.xhp#seitenansichtleiste"/>
 </section>
-<section id="Section10">
-<embed href="text/shared/main0209.xhp#hyperlink"/>
-</section>
 <section id="Section12">
 <embed href="text/scalc/main0208.xhp#statusleiste"/>
 </section>
diff --git a/helpcontent2/source/text/scalc/main0202.xhp b/helpcontent2/source/text/scalc/main0202.xhp
index a7fe3a4585..297824dc68 100755..100644
--- a/helpcontent2/source/text/scalc/main0202.xhp
+++ b/helpcontent2/source/text/scalc/main0202.xhp
@@ -115,7 +115,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="tablecontent" id="par_idN1089C" xml-lang="en-US" l10n="NEW">
-<image id="img_id8354747" src="res/commandimagelist/sc_paralefttoright.png" width="0.222inch" height="0.222inch"><alt id="alt_id8354747" xml-lang="en-US">left to right icon</alt>
+<image id="img_id8354747" src="cmd/sc_paralefttoright.png" width="0.222inch" height="0.222inch"><alt id="alt_id8354747" xml-lang="en-US">left to right icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -130,7 +130,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="tablecontent" id="par_idN108DF" xml-lang="en-US" l10n="NEW">
-<image id="img_id2405774" src="res/commandimagelist/sc_pararighttoleft.png" width="0.222inch" height="0.222inch"><alt id="alt_id2405774" xml-lang="en-US">right to left icon</alt>
+<image id="img_id2405774" src="cmd/sc_pararighttoleft.png" width="0.222inch" height="0.222inch"><alt id="alt_id2405774" xml-lang="en-US">right to left icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/scalc/main0203.xhp b/helpcontent2/source/text/scalc/main0203.xhp
index 21d0dbd679..21d0dbd679 100755..100644
--- a/helpcontent2/source/text/scalc/main0203.xhp
+++ b/helpcontent2/source/text/scalc/main0203.xhp
diff --git a/helpcontent2/source/text/scalc/main0205.xhp b/helpcontent2/source/text/scalc/main0205.xhp
index 83f2ff538e..83f2ff538e 100755..100644
--- a/helpcontent2/source/text/scalc/main0205.xhp
+++ b/helpcontent2/source/text/scalc/main0205.xhp
diff --git a/helpcontent2/source/text/scalc/main0208.xhp b/helpcontent2/source/text/scalc/main0208.xhp
index 63f0a9faa8..63f0a9faa8 100755..100644
--- a/helpcontent2/source/text/scalc/main0208.xhp
+++ b/helpcontent2/source/text/scalc/main0208.xhp
diff --git a/helpcontent2/source/text/scalc/main0214.xhp b/helpcontent2/source/text/scalc/main0214.xhp
index ae1028af34..ae1028af34 100755..100644
--- a/helpcontent2/source/text/scalc/main0214.xhp
+++ b/helpcontent2/source/text/scalc/main0214.xhp
diff --git a/helpcontent2/source/text/scalc/main0218.xhp b/helpcontent2/source/text/scalc/main0218.xhp
index 88472cb9cb..88472cb9cb 100755..100644
--- a/helpcontent2/source/text/scalc/main0218.xhp
+++ b/helpcontent2/source/text/scalc/main0218.xhp
diff --git a/helpcontent2/source/text/scalc/main0503.xhp b/helpcontent2/source/text/scalc/main0503.xhp
index 21cef33e4b..21cef33e4b 100755..100644
--- a/helpcontent2/source/text/scalc/main0503.xhp
+++ b/helpcontent2/source/text/scalc/main0503.xhp
diff --git a/helpcontent2/source/text/schart/00/00000004.xhp b/helpcontent2/source/text/schart/00/00000004.xhp
index 9b13c005d4..6b506e449c 100644
--- a/helpcontent2/source/text/schart/00/00000004.xhp
+++ b/helpcontent2/source/text/schart/00/00000004.xhp
@@ -48,7 +48,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3153728" xml-lang="en-US" l10n="E">
-<image id="img_id3147428" src="res/commandimagelist/sc_grid.png" width="0.1665in" height="0.1665in"><alt id="alt_id3147428" xml-lang="en-US">Icon</alt>
+<image id="img_id3147428" src="cmd/sc_grid.png" width="0.1665in" height="0.1665in"><alt id="alt_id3147428" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -78,7 +78,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150307" xml-lang="en-US" l10n="E">
-<image id="img_id3155111" src="res/commandimagelist/sc_togglegridhorizontal.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155111" xml-lang="en-US">Icon</alt>
+<image id="img_id3155111" src="cmd/sc_togglegridhorizontal.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155111" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -88,7 +88,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3145384" xml-lang="en-US" l10n="E">
-<image id="img_id3152989" src="res/commandimagelist/sc_togglegridvertical.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152989" xml-lang="en-US">Icon</alt>
+<image id="img_id3152989" src="cmd/sc_togglegridvertical.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152989" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -152,7 +152,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3148582" xml-lang="en-US" l10n="E">
-<image id="img_id3153124" src="res/commandimagelist/sc_diagramtype.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153124" xml-lang="en-US">Icon</alt>
+<image id="img_id3153124" src="cmd/sc_diagramtype.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153124" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -173,7 +173,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3151020" xml-lang="en-US" l10n="E">
-<image id="img_id3150936" src="res/commandimagelist/sc_toggletitle.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150936" xml-lang="en-US">Icon</alt>
+<image id="img_id3150936" src="cmd/sc_toggletitle.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150936" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -189,7 +189,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3149775" xml-lang="en-US" l10n="E">
-<image id="img_id3149781" src="res/commandimagelist/sc_toggleaxistitle.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149781" xml-lang="en-US">Icon</alt>
+<image id="img_id3149781" src="cmd/sc_toggleaxistitle.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149781" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -204,7 +204,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3163824" xml-lang="en-US" l10n="E">
-<image id="img_id3149708" src="res/commandimagelist/sc_togglegridhorizontal.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149708" xml-lang="en-US">Icon</alt>
+<image id="img_id3149708" src="cmd/sc_togglegridhorizontal.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149708" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -219,7 +219,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3151183" xml-lang="en-US" l10n="E">
-<image id="img_id3151189" src="res/commandimagelist/sc_toggleaxisdescr.png" width="0.2228in" height="0.2228in"><alt id="alt_id3151189" xml-lang="en-US">Icon</alt>
+<image id="img_id3151189" src="cmd/sc_toggleaxisdescr.png" width="0.2228in" height="0.2228in"><alt id="alt_id3151189" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -234,7 +234,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3156315" xml-lang="en-US" l10n="E">
-<image id="img_id3156322" src="res/commandimagelist/sc_togglegridvertical.png" width="0.2228in" height="0.2228in"><alt id="alt_id3156322" xml-lang="en-US">Icon</alt>
+<image id="img_id3156322" src="cmd/sc_togglegridvertical.png" width="0.2228in" height="0.2228in"><alt id="alt_id3156322" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -253,7 +253,7 @@
 </caseinline></switchinline> Chart </paragraph>
 <paragraph role="paragraph" id="par_id1096530" xml-lang="en-US" l10n="NEW">Double-click a chart, then choose Format - Data Ranges</paragraph>
 </section>
-<paragraph role="paragraph" id="par_id733359" xml-lang="en-US" l10n="NEW"><variable id="slp">In a chart of Line type or XY type which displays lines, mark Smooth lines and click the Properties button
+<paragraph role="paragraph" id="par_id733359" xml-lang="en-US" l10n="NEW"><variable id="slp">In the Chart Type dialog of a Line chart or XY chart that displays lines, mark Smooth lines checkbox, then click the Properties button.
 </variable></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/schart/01/04020000.xhp b/helpcontent2/source/text/schart/01/04020000.xhp
index 11d6be94f2..aa74afbe3a 100644
--- a/helpcontent2/source/text/schart/01/04020000.xhp
+++ b/helpcontent2/source/text/schart/01/04020000.xhp
@@ -56,7 +56,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3145230" xml-lang="en-US" l10n="E">
-<image id="img_id3147346" src="res/commandimagelist/sc_togglelegend.png" width="0.1665in" height="0.1665in"><alt id="alt_id3147346" xml-lang="en-US">Icon</alt>
+<image id="img_id3147346" src="cmd/sc_togglelegend.png" width="0.1665in" height="0.1665in"><alt id="alt_id3147346" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/schart/01/05020000.xhp b/helpcontent2/source/text/schart/01/05020000.xhp
index 4cac653f13..4cac653f13 100755..100644
--- a/helpcontent2/source/text/schart/01/05020000.xhp
+++ b/helpcontent2/source/text/schart/01/05020000.xhp
diff --git a/helpcontent2/source/text/schart/01/05050000.xhp b/helpcontent2/source/text/schart/01/05050000.xhp
index 106db1721e..106db1721e 100755..100644
--- a/helpcontent2/source/text/schart/01/05050000.xhp
+++ b/helpcontent2/source/text/schart/01/05050000.xhp
diff --git a/helpcontent2/source/text/schart/02/01190000.xhp b/helpcontent2/source/text/schart/02/01190000.xhp
index 83cbc4e913..f50f39c32c 100644
--- a/helpcontent2/source/text/schart/02/01190000.xhp
+++ b/helpcontent2/source/text/schart/02/01190000.xhp
@@ -50,7 +50,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150751" xml-lang="en-US" l10n="E">
-<image id="img_id3145643" src="res/commandimagelist/sc_datainrows.png"  ><alt id="alt_id3145643" xml-lang="en-US">Icon</alt>
+<image id="img_id3145643" src="cmd/sc_datainrows.png"  ><alt id="alt_id3145643" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/schart/02/01200000.xhp b/helpcontent2/source/text/schart/02/01200000.xhp
index f04cb2d1c6..cbd1c192b8 100644
--- a/helpcontent2/source/text/schart/02/01200000.xhp
+++ b/helpcontent2/source/text/schart/02/01200000.xhp
@@ -50,7 +50,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149260" xml-lang="en-US" l10n="E">
-<image id="img_id3149379" src="res/commandimagelist/sc_dataincolumns.png"  ><alt id="alt_id3149379" xml-lang="en-US">Icon</alt>
+<image id="img_id3149379" src="cmd/sc_dataincolumns.png"  ><alt id="alt_id3149379" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/schart/02/01210000.xhp b/helpcontent2/source/text/schart/02/01210000.xhp
index dadebf2d7c..8d5a30e027 100644
--- a/helpcontent2/source/text/schart/02/01210000.xhp
+++ b/helpcontent2/source/text/schart/02/01210000.xhp
@@ -56,7 +56,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150441" xml-lang="en-US" l10n="E">
-<image id="img_id3159153" src="res/commandimagelist/sc_scaletext.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3159153" xml-lang="en-US">Icon</alt>
+<image id="img_id3159153" src="cmd/sc_scaletext.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3159153" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/schart/02/01220000.xhp b/helpcontent2/source/text/schart/02/01220000.xhp
index e3bfd68129..0c8411f6bd 100644
--- a/helpcontent2/source/text/schart/02/01220000.xhp
+++ b/helpcontent2/source/text/schart/02/01220000.xhp
@@ -56,7 +56,7 @@ YJ: checked</lastedited>
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="E">
-<image id="img_id3152577" src="res/commandimagelist/sc_newarrangement.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152577" xml-lang="en-US">Icon</alt>
+<image id="img_id3152577" src="cmd/sc_newarrangement.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152577" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/schart/04/01020000.xhp b/helpcontent2/source/text/schart/04/01020000.xhp
index dd9b507525..dd9b507525 100755..100644
--- a/helpcontent2/source/text/schart/04/01020000.xhp
+++ b/helpcontent2/source/text/schart/04/01020000.xhp
diff --git a/helpcontent2/source/text/schart/main0202.xhp b/helpcontent2/source/text/schart/main0202.xhp
index afbc4bba2b..afbc4bba2b 100755..100644
--- a/helpcontent2/source/text/schart/main0202.xhp
+++ b/helpcontent2/source/text/schart/main0202.xhp
diff --git a/helpcontent2/source/text/schart/main0503.xhp b/helpcontent2/source/text/schart/main0503.xhp
index bb75088942..bb75088942 100755..100644
--- a/helpcontent2/source/text/schart/main0503.xhp
+++ b/helpcontent2/source/text/schart/main0503.xhp
diff --git a/helpcontent2/source/text/sdraw/00/00000004.xhp b/helpcontent2/source/text/sdraw/00/00000004.xhp
index 79df20d16f..79df20d16f 100755..100644
--- a/helpcontent2/source/text/sdraw/00/00000004.xhp
+++ b/helpcontent2/source/text/sdraw/00/00000004.xhp
diff --git a/helpcontent2/source/text/sdraw/01/04010000.xhp b/helpcontent2/source/text/sdraw/01/04010000.xhp
index 7b1be9d48b..7b1be9d48b 100755..100644
--- a/helpcontent2/source/text/sdraw/01/04010000.xhp
+++ b/helpcontent2/source/text/sdraw/01/04010000.xhp
diff --git a/helpcontent2/source/text/sdraw/04/01020000.xhp b/helpcontent2/source/text/sdraw/04/01020000.xhp
index cc6c43c564..cc6c43c564 100755..100644
--- a/helpcontent2/source/text/sdraw/04/01020000.xhp
+++ b/helpcontent2/source/text/sdraw/04/01020000.xhp
diff --git a/helpcontent2/source/text/sdraw/guide/align_arrange.xhp b/helpcontent2/source/text/sdraw/guide/align_arrange.xhp
index 94e593aa39..94e593aa39 100755..100644
--- a/helpcontent2/source/text/sdraw/guide/align_arrange.xhp
+++ b/helpcontent2/source/text/sdraw/guide/align_arrange.xhp
diff --git a/helpcontent2/source/text/sdraw/guide/draw_sector.xhp b/helpcontent2/source/text/sdraw/guide/draw_sector.xhp
index 0180f6ff4c..ee2d81e09a 100644
--- a/helpcontent2/source/text/sdraw/guide/draw_sector.xhp
+++ b/helpcontent2/source/text/sdraw/guide/draw_sector.xhp
@@ -55,7 +55,7 @@
 <list type="ordered">
 <listitem>
 <paragraph role="paragraph" id="par_id3155335" xml-lang="en-US" l10n="U" oldref="33">Open the <emph>Ellipses</emph> toolbar and click one of the <emph>Circle Pie</emph> or <emph>Ellipse Pie</emph> icons 
-<image id="img_id3155768" src="res/commandimagelist/sc_circlepie_unfilled.png" width="5.64mm" height="5.64mm"><alt id="alt_id3155768" xml-lang="en-US">Icon</alt>
+<image id="img_id3155768" src="cmd/sc_circlepie_unfilled.png" width="5.64mm" height="5.64mm"><alt id="alt_id3155768" xml-lang="en-US">Icon</alt>
 	</image>. The mouse pointer changes to a cross hair with a small icon of a sector.</paragraph>
 </listitem>
 <listitem>
diff --git a/helpcontent2/source/text/sdraw/guide/eyedropper.xhp b/helpcontent2/source/text/sdraw/guide/eyedropper.xhp
index 9ba1d60946..9ba1d60946 100755..100644
--- a/helpcontent2/source/text/sdraw/guide/eyedropper.xhp
+++ b/helpcontent2/source/text/sdraw/guide/eyedropper.xhp
diff --git a/helpcontent2/source/text/sdraw/guide/gradient.xhp b/helpcontent2/source/text/sdraw/guide/gradient.xhp
index 2a43ad1eea..2a43ad1eea 100755..100644
--- a/helpcontent2/source/text/sdraw/guide/gradient.xhp
+++ b/helpcontent2/source/text/sdraw/guide/gradient.xhp
diff --git a/helpcontent2/source/text/sdraw/guide/graphic_insert.xhp b/helpcontent2/source/text/sdraw/guide/graphic_insert.xhp
index 052bc174fe..052bc174fe 100755..100644
--- a/helpcontent2/source/text/sdraw/guide/graphic_insert.xhp
+++ b/helpcontent2/source/text/sdraw/guide/graphic_insert.xhp
diff --git a/helpcontent2/source/text/sdraw/guide/groups.xhp b/helpcontent2/source/text/sdraw/guide/groups.xhp
index 4bd352366e..a54f591231 100644
--- a/helpcontent2/source/text/sdraw/guide/groups.xhp
+++ b/helpcontent2/source/text/sdraw/guide/groups.xhp
@@ -59,7 +59,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149018" xml-lang="en-US" l10n="E">
-<image id="img_id3145643" src="res/commandimagelist/sc_formatgroup.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3145643" xml-lang="en-US">Icon</alt>
+<image id="img_id3145643" src="cmd/sc_formatgroup.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3145643" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -74,7 +74,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150370" xml-lang="en-US" l10n="E">
-<image id="img_id3155376" src="res/commandimagelist/sc_entergroup.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3155376" xml-lang="en-US">Icon</alt>
+<image id="img_id3155376" src="cmd/sc_entergroup.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3155376" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -86,7 +86,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3151239" xml-lang="en-US" l10n="E">
-<image id="img_id3155264" src="res/commandimagelist/sc_leavegroup.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3155264" xml-lang="en-US">Icon</alt>
+<image id="img_id3155264" src="cmd/sc_leavegroup.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3155264" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/sdraw/guide/join_objects.xhp b/helpcontent2/source/text/sdraw/guide/join_objects.xhp
index d2587c100c..d2587c100c 100755..100644
--- a/helpcontent2/source/text/sdraw/guide/join_objects.xhp
+++ b/helpcontent2/source/text/sdraw/guide/join_objects.xhp
diff --git a/helpcontent2/source/text/sdraw/guide/main.xhp b/helpcontent2/source/text/sdraw/guide/main.xhp
index 0de581c741..0de581c741 100755..100644
--- a/helpcontent2/source/text/sdraw/guide/main.xhp
+++ b/helpcontent2/source/text/sdraw/guide/main.xhp
diff --git a/helpcontent2/source/text/sdraw/guide/rotate_object.xhp b/helpcontent2/source/text/sdraw/guide/rotate_object.xhp
index 3ff79f2592..f823d5823e 100644
--- a/helpcontent2/source/text/sdraw/guide/rotate_object.xhp
+++ b/helpcontent2/source/text/sdraw/guide/rotate_object.xhp
@@ -50,7 +50,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3146975" xml-lang="en-US" l10n="E">
-<image id="img_id3154729" src="res/commandimagelist/sc_toggleobjectrotatemode.png" width="0.564cm" height="0.564cm"><alt id="alt_id3154729" xml-lang="en-US">Icon</alt>
+<image id="img_id3154729" src="cmd/sc_toggleobjectrotatemode.png" width="0.564cm" height="0.564cm"><alt id="alt_id3154729" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/sdraw/guide/text_enter.xhp b/helpcontent2/source/text/sdraw/guide/text_enter.xhp
index a11c063357..83e4595aff 100644
--- a/helpcontent2/source/text/sdraw/guide/text_enter.xhp
+++ b/helpcontent2/source/text/sdraw/guide/text_enter.xhp
@@ -70,7 +70,7 @@
       <list type="ordered">
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3155266" role="paragraph" l10n="U" oldref="49">Click the <emph>Text</emph> icon 
-<image id="img_id3156450" src="res/commandimagelist/sc_text.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3156450">Icon</alt>
+<image id="img_id3156450" src="cmd/sc_text.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3156450">Icon</alt>
 	</image> and move the mouse pointer to where you want to enter the text box.</paragraph>
          </listitem>
          <listitem>
@@ -104,7 +104,7 @@
       <list type="ordered">
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3147366" role="paragraph" l10n="CHG" oldref="59">For example, click the arrow next to the <emph>Callouts</emph> icon 
-<image id="img_id3154508" src="res/commandimagelist/sc_calloutshapes.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3154508">Icon</alt>
+<image id="img_id3154508" src="cmd/sc_calloutshapes.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3154508">Icon</alt>
 	</image> to open the Callouts toolbar.</paragraph>
          </listitem>
          <listitem>
diff --git a/helpcontent2/source/text/sdraw/main0100.xhp b/helpcontent2/source/text/sdraw/main0100.xhp
index 68d5b3ebd3..68d5b3ebd3 100755..100644
--- a/helpcontent2/source/text/sdraw/main0100.xhp
+++ b/helpcontent2/source/text/sdraw/main0100.xhp
diff --git a/helpcontent2/source/text/sdraw/main0101.xhp b/helpcontent2/source/text/sdraw/main0101.xhp
index f7653cc629..f7653cc629 100755..100644
--- a/helpcontent2/source/text/sdraw/main0101.xhp
+++ b/helpcontent2/source/text/sdraw/main0101.xhp
diff --git a/helpcontent2/source/text/sdraw/main0102.xhp b/helpcontent2/source/text/sdraw/main0102.xhp
index 6f023f5c9f..6f023f5c9f 100755..100644
--- a/helpcontent2/source/text/sdraw/main0102.xhp
+++ b/helpcontent2/source/text/sdraw/main0102.xhp
diff --git a/helpcontent2/source/text/sdraw/main0103.xhp b/helpcontent2/source/text/sdraw/main0103.xhp
index 89abf0ebc9..89abf0ebc9 100755..100644
--- a/helpcontent2/source/text/sdraw/main0103.xhp
+++ b/helpcontent2/source/text/sdraw/main0103.xhp
diff --git a/helpcontent2/source/text/sdraw/main0104.xhp b/helpcontent2/source/text/sdraw/main0104.xhp
index 0549ebd689..0549ebd689 100755..100644
--- a/helpcontent2/source/text/sdraw/main0104.xhp
+++ b/helpcontent2/source/text/sdraw/main0104.xhp
diff --git a/helpcontent2/source/text/sdraw/main0105.xhp b/helpcontent2/source/text/sdraw/main0105.xhp
index d52b0b318b..d52b0b318b 100755..100644
--- a/helpcontent2/source/text/sdraw/main0105.xhp
+++ b/helpcontent2/source/text/sdraw/main0105.xhp
diff --git a/helpcontent2/source/text/sdraw/main0106.xhp b/helpcontent2/source/text/sdraw/main0106.xhp
index 460400d868..460400d868 100755..100644
--- a/helpcontent2/source/text/sdraw/main0106.xhp
+++ b/helpcontent2/source/text/sdraw/main0106.xhp
diff --git a/helpcontent2/source/text/sdraw/main0200.xhp b/helpcontent2/source/text/sdraw/main0200.xhp
index cb4c7c3445..cb4c7c3445 100755..100644
--- a/helpcontent2/source/text/sdraw/main0200.xhp
+++ b/helpcontent2/source/text/sdraw/main0200.xhp
diff --git a/helpcontent2/source/text/sdraw/main0202.xhp b/helpcontent2/source/text/sdraw/main0202.xhp
index e410a85f33..e410a85f33 100755..100644
--- a/helpcontent2/source/text/sdraw/main0202.xhp
+++ b/helpcontent2/source/text/sdraw/main0202.xhp
diff --git a/helpcontent2/source/text/sdraw/main0210.xhp b/helpcontent2/source/text/sdraw/main0210.xhp
index d33a2c0350..d33a2c0350 100755..100644
--- a/helpcontent2/source/text/sdraw/main0210.xhp
+++ b/helpcontent2/source/text/sdraw/main0210.xhp
diff --git a/helpcontent2/source/text/sdraw/main0213.xhp b/helpcontent2/source/text/sdraw/main0213.xhp
index 9ef637617c..c45a7c35be 100755..100644
--- a/helpcontent2/source/text/sdraw/main0213.xhp
+++ b/helpcontent2/source/text/sdraw/main0213.xhp
@@ -53,13 +53,13 @@
 <embed href="text/shared/02/01171200.xhp#syrastsicht"/>
 <embed href="text/simpress/02/13050000.xhp#hilfslinsicht"/>
 <embed href="text/simpress/02/13050000.xhp#hilfsicht"/>
-<paragraph role="heading" id="hd_id3149018" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/shared/02/01171400.xhp" name="Guides When Moving">Guides When Moving</link></paragraph>
+<paragraph role="heading" id="hd_id3149018" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/shared/02/01171400.xhp" name="Helplines While Moving">Helplines While Moving</link></paragraph>
 <embed href="text/shared/optionen/01070100.xhp#verschieb"/>
 <embed href="text/shared/02/01171400.xhp#syhline"/>
 <paragraph role="heading" id="hd_id3147338" xml-lang="en-US" level="2" l10n="U" oldref="6"><link href="text/shared/02/01171300.xhp" name="Snap to Grid">Snap to Grid</link></paragraph>
 <embed href="text/shared/optionen/01050100.xhp#rasterfang"/>
 <embed href="text/shared/02/01171300.xhp#syrafang"/>
-<paragraph role="heading" id="hd_id3146313" xml-lang="en-US" level="2" l10n="CHG" oldref="7"><link href="text/simpress/02/13140000.xhp" name="Snap to Guides">Snap to Guides</link></paragraph>
+<paragraph role="heading" id="hd_id3146313" xml-lang="en-US" level="2" l10n="CHG" oldref="7"><link href="text/simpress/02/13140000.xhp" name="Snap to Snap Lines">Snap to Snap Lines</link></paragraph>
 <embed href="text/shared/optionen/01070300.xhp#anlinie"/>
 <embed href="text/simpress/02/13140000.xhp#syanline"/>
 <paragraph role="heading" id="hd_id3155111" xml-lang="en-US" level="2" l10n="U" oldref="8"><link href="text/simpress/02/13150000.xhp" name="Snap to Page Margins">Snap to Page Margins</link></paragraph>
diff --git a/helpcontent2/source/text/sdraw/main0503.xhp b/helpcontent2/source/text/sdraw/main0503.xhp
index a152dabb5d..3103d30870 100755..100644
--- a/helpcontent2/source/text/sdraw/main0503.xhp
+++ b/helpcontent2/source/text/sdraw/main0503.xhp
@@ -48,8 +48,8 @@
   <paragraph role="paragraph" id="par_id3153142" l10n="U" xml-lang="en-US" oldref="12">$[officename] Draw creates vector graphics using lines and curves defined by mathematical vectors. Vectors describe lines, ellipses, and polygons according to their geometry.</paragraph>
   <paragraph role="heading" level="2" id="hd_id3154320" l10n="U" xml-lang="en-US" oldref="14">Creating 3D Objects</paragraph>
   <paragraph role="paragraph" id="par_id3145251" l10n="U" xml-lang="en-US" oldref="15">You can create simple 3D objects such as cubes, spheres, and cylinders in $[officename] Draw and even modify the light source of the objects.</paragraph>
-  <paragraph role="heading" level="2" id="hd_id3154491" l10n="U" xml-lang="en-US" oldref="20">Grids and Guides</paragraph>
-  <paragraph role="paragraph" id="par_id3149379" l10n="U" xml-lang="en-US" oldref="6">Grids and guides provide a visual cue to help you align objects in your drawing. You can also choose to snap an object to a grid line, guide or to the edge of another object.</paragraph>
+  <paragraph role="heading" level="2" id="hd_id3154491" l10n="U" xml-lang="en-US" oldref="20">Grids and Snap Lines</paragraph>
+  <paragraph role="paragraph" id="par_id3149379" l10n="U" xml-lang="en-US" oldref="6">Grids and snap lines provide a visual cue to help you align objects in your drawing. You can also choose to snap an object to a grid line, snap line or to the edge of another object.</paragraph>
   <paragraph role="heading" level="2" id="hd_id3155601" l10n="U" xml-lang="en-US" oldref="16">Connecting Objects to Show Relationships</paragraph>
   <paragraph role="paragraph" id="par_id3149124" l10n="U" xml-lang="en-US" oldref="17">You can connect objects in $[officename] Draw with special lines called &quot;connectors&quot; to show the relationship between objects. Connectors attach to glue points on drawing objects and remain attached when the connected objects are moved. Connectors are useful for creating organization charts and technical diagrams.</paragraph>
   <paragraph role="heading" level="2" id="hd_id3155764" l10n="U" xml-lang="en-US" oldref="21">Displaying Dimensions</paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000002.xhp b/helpcontent2/source/text/shared/00/00000002.xhp
index 25ddb8c548..25ddb8c548 100755..100644
--- a/helpcontent2/source/text/shared/00/00000002.xhp
+++ b/helpcontent2/source/text/shared/00/00000002.xhp
diff --git a/helpcontent2/source/text/shared/00/00000003.xhp b/helpcontent2/source/text/shared/00/00000003.xhp
index 752f6846e9..752f6846e9 100755..100644
--- a/helpcontent2/source/text/shared/00/00000003.xhp
+++ b/helpcontent2/source/text/shared/00/00000003.xhp
diff --git a/helpcontent2/source/text/shared/00/00000004.xhp b/helpcontent2/source/text/shared/00/00000004.xhp
index 80fbf4adeb..0589757718 100644
--- a/helpcontent2/source/text/shared/00/00000004.xhp
+++ b/helpcontent2/source/text/shared/00/00000004.xhp
@@ -58,7 +58,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154689" xml-lang="en-US" l10n="E">
-<image id="img_id3152427" src="res/commandimagelist/sc_color.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152427" xml-lang="en-US">Icon</alt>
+<image id="img_id3152427" src="cmd/sc_color.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152427" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -73,7 +73,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3157898" xml-lang="en-US" l10n="E">
-<image id="img_id3149716" src="res/commandimagelist/sc_color.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149716" xml-lang="en-US">Icon</alt>
+<image id="img_id3149716" src="cmd/sc_color.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149716" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -88,7 +88,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149750" xml-lang="en-US" l10n="E">
-<image id="img_id3146957" src="res/commandimagelist/sc_justifypara.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146957" xml-lang="en-US">Icon</alt>
+<image id="img_id3146957" src="cmd/sc_justifypara.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146957" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -103,7 +103,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145382" xml-lang="en-US" l10n="E">
-<image id="img_id3163802" src="res/commandimagelist/sc_spacepara15.png" width="0.222inch" height="0.222inch"><alt id="alt_id3163802" xml-lang="en-US">Icon</alt>
+<image id="img_id3163802" src="cmd/sc_spacepara15.png" width="0.222inch" height="0.222inch"><alt id="alt_id3163802" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -118,7 +118,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150131" xml-lang="en-US" l10n="E">
-<image id="img_id3153252" src="res/commandimagelist/sc_spacepara2.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153252" xml-lang="en-US">Icon</alt>
+<image id="img_id3153252" src="cmd/sc_spacepara2.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153252" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -133,7 +133,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149820" xml-lang="en-US" l10n="E">
-<image id="img_id3153126" src="res/commandimagelist/sc_superscript.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153126" xml-lang="en-US">Icon</alt>
+<image id="img_id3153126" src="cmd/sc_superscript.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153126" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -148,7 +148,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3147077" xml-lang="en-US" l10n="E">
-<image id="img_id3155135" src="res/commandimagelist/sc_subscript.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155135" xml-lang="en-US">Icon</alt>
+<image id="img_id3155135" src="cmd/sc_subscript.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155135" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -223,7 +223,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153367" xml-lang="en-US" l10n="E">
-<image id="img_id3147502" src="res/commandimagelist/sc_aligntop.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147502" xml-lang="en-US">Icon</alt>
+<image id="img_id3147502" src="cmd/sc_aligntop.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147502" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -238,7 +238,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3146923" xml-lang="en-US" l10n="E">
-<image id="img_id3150410" src="res/commandimagelist/sc_cellvertbottom.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150410" xml-lang="en-US">Icon</alt>
+<image id="img_id3150410" src="cmd/sc_cellvertbottom.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150410" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -253,7 +253,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153097" xml-lang="en-US" l10n="E">
-<image id="img_id3153363" src="res/commandimagelist/sc_alignvcenter.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153363" xml-lang="en-US">Icon</alt>
+<image id="img_id3153363" src="cmd/sc_alignvcenter.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153363" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -399,7 +399,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3083285" xml-lang="en-US" l10n="E">
-<image id="img_id3147100" src="res/commandimagelist/sc_open.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147100" xml-lang="en-US">Icon</alt>
+<image id="img_id3147100" src="cmd/sc_open.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147100" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -414,7 +414,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3151189" xml-lang="en-US" l10n="E">
-<image id="img_id3156318" src="res/commandimagelist/sc_saveas.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156318" xml-lang="en-US">Icon</alt>
+<image id="img_id3156318" src="cmd/sc_saveas.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156318" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -429,7 +429,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3152946" xml-lang="en-US" l10n="E">
-<image id="img_id3155904" src="res/commandimagelist/sc_exportdirecttopdf.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155904" xml-lang="en-US">Icon</alt>
+<image id="img_id3155904" src="cmd/sc_exportdirecttopdf.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155904" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/00/00000005.xhp b/helpcontent2/source/text/shared/00/00000005.xhp
index 31a5808247..affaff6a52 100755..100644
--- a/helpcontent2/source/text/shared/00/00000005.xhp
+++ b/helpcontent2/source/text/shared/00/00000005.xhp
@@ -115,7 +115,7 @@
    
    <paragraph xml-lang="en-US" id="hd_id3150439" role="heading" level="2" l10n="U" oldref="156">Direct and Style Formatting</paragraph>
    <paragraph xml-lang="en-US" id="par_id3159254" role="paragraph" l10n="U" oldref="34">If you format a document without Styles, it is referred to as "direct" formatting. This means modifying text or other objects, such as frames or tables, by applying various attributes directly. The format applies only to the selected area and all changes must be made separately. Styles, on the other hand, are not applied to the text directly, but rather are defined in the Styles and Formatting window and then applied. One advantage is that when you change a Style, all parts of the document to which that Style is assigned are modified at the same time.</paragraph>
-   <paragraph xml-lang="en-US" id="par_id3147287" role="paragraph" l10n="CHG" oldref="35">You can remove direct formatting from your document by selecting the entire text with the shortcut keys <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A and then choosing <emph>Format - Default Formatting</emph>.</paragraph>
+   <paragraph xml-lang="en-US" id="par_id3147287" role="paragraph" l10n="CHG" oldref="35">You can remove direct formatting from your document by selecting the entire text with the shortcut keys <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A and then choosing <emph>Format - Clear Direct Formatting</emph>.</paragraph>
    
   </section>
   <section id="andocken">
diff --git a/helpcontent2/source/text/shared/00/00000007.xhp b/helpcontent2/source/text/shared/00/00000007.xhp
index ca61787efd..ca61787efd 100755..100644
--- a/helpcontent2/source/text/shared/00/00000007.xhp
+++ b/helpcontent2/source/text/shared/00/00000007.xhp
diff --git a/helpcontent2/source/text/shared/00/00000200.xhp b/helpcontent2/source/text/shared/00/00000200.xhp
index f4683c0b9c..f4683c0b9c 100755..100644
--- a/helpcontent2/source/text/shared/00/00000200.xhp
+++ b/helpcontent2/source/text/shared/00/00000200.xhp
diff --git a/helpcontent2/source/text/shared/00/00000206.xhp b/helpcontent2/source/text/shared/00/00000206.xhp
index 3b6ad27df0..3b6ad27df0 100755..100644
--- a/helpcontent2/source/text/shared/00/00000206.xhp
+++ b/helpcontent2/source/text/shared/00/00000206.xhp
diff --git a/helpcontent2/source/text/shared/00/00000207.xhp b/helpcontent2/source/text/shared/00/00000207.xhp
index 6bed5d8418..6bed5d8418 100755..100644
--- a/helpcontent2/source/text/shared/00/00000207.xhp
+++ b/helpcontent2/source/text/shared/00/00000207.xhp
diff --git a/helpcontent2/source/text/shared/00/00000208.xhp b/helpcontent2/source/text/shared/00/00000208.xhp
index fe47971b17..ec1cfdedf7 100644
--- a/helpcontent2/source/text/shared/00/00000208.xhp
+++ b/helpcontent2/source/text/shared/00/00000208.xhp
@@ -104,7 +104,7 @@
 <paragraph role="heading" id="hd_id3155388" xml-lang="en-US" level="2" l10n="U" oldref="61">Fields</paragraph>
 <paragraph role="paragraph" id="par_id3153665" xml-lang="en-US" l10n="U" oldref="62">Shows how your data will look when it is separated into columns.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_ASCII:LB_TYPE1" id="bm_id3157909" localize="false"/><paragraph role="heading" id="hd_id3148474" xml-lang="en-US" level="3" l10n="U" oldref="63">Column type</paragraph>
-<paragraph role="paragraph" id="par_id3149957" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SC:LISTBOX:RID_SCDLG_ASCII:LB_TYPE1">Choose a column in the preview window and select the data type to be applied the imported data.</ahelp> You can select one of the following options:</paragraph>
+<paragraph role="paragraph" id="par_id314995725" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SC:LISTBOX:RID_SCDLG_ASCII:LB_TYPE1">Choose a column in the preview window and select the data type to be applied the imported data.</ahelp> You can select one of the following options:</paragraph>
 <table id="tbl_id3155179">
 <tablerow>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/00/00000215.xhp b/helpcontent2/source/text/shared/00/00000215.xhp
index 073dbcffb9..073dbcffb9 100755..100644
--- a/helpcontent2/source/text/shared/00/00000215.xhp
+++ b/helpcontent2/source/text/shared/00/00000215.xhp
diff --git a/helpcontent2/source/text/shared/00/00000401.xhp b/helpcontent2/source/text/shared/00/00000401.xhp
index 215a3c45d0..cefa780cbe 100644
--- a/helpcontent2/source/text/shared/00/00000401.xhp
+++ b/helpcontent2/source/text/shared/00/00000401.xhp
@@ -100,7 +100,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3155419" xml-lang="en-US" l10n="E">
-<image id="img_id3149415" src="res/commandimagelist/sc_open.png" width="0.566cm" height="0.566cm"><alt id="alt_id3149415" xml-lang="en-US">Icon</alt>
+<image id="img_id3149415" src="cmd/sc_open.png" width="0.566cm" height="0.566cm"><alt id="alt_id3149415" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -221,7 +221,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3156712" xml-lang="en-US" l10n="E">
-<image id="img_id3155939" src="res/commandimagelist/sc_save.png" width="0.566cm" height="0.566cm"><alt id="alt_id3155939" xml-lang="en-US">Icon</alt>
+<image id="img_id3155939" src="cmd/sc_save.png" width="0.566cm" height="0.566cm"><alt id="alt_id3155939" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -237,7 +237,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_idN10F11" xml-lang="en-US" l10n="NEW">
-<image id="img_id8276619" src="res/commandimagelist/sc_saveas.png" width="0.566cm" height="0.566cm"><alt id="alt_id8276619" xml-lang="en-US">Icon</alt>
+<image id="img_id8276619" src="cmd/sc_saveas.png" width="0.566cm" height="0.566cm"><alt id="alt_id8276619" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -322,7 +322,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_idN11366" xml-lang="en-US" l10n="NEW">
-<image id="img_id2603534" src="res/commandimagelist/sc_printpreview.png" width="0.566cm" height="0.566cm"><alt id="alt_id2603534" xml-lang="en-US">Icon</alt>
+<image id="img_id2603534" src="cmd/sc_printpreview.png" width="0.566cm" height="0.566cm"><alt id="alt_id2603534" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -349,7 +349,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_idN113AB" xml-lang="en-US" l10n="NEW">
-<image id="img_id4044007" src="res/commandimagelist/sc_sendmail.png" width="0.566cm" height="0.566cm"><alt id="alt_id4044007" xml-lang="en-US">Icon</alt>
+<image id="img_id4044007" src="cmd/sc_sendmail.png" width="0.566cm" height="0.566cm"><alt id="alt_id4044007" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -370,7 +370,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150521" xml-lang="en-US" l10n="E">
-<image id="img_id3147306" src="res/commandimagelist/sc_exportdirecttopdf.png" width="0.566cm" height="0.566cm"><alt id="alt_id3147306" xml-lang="en-US">Icon</alt>
+<image id="img_id3147306" src="cmd/sc_exportdirecttopdf.png" width="0.566cm" height="0.566cm"><alt id="alt_id3147306" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -397,7 +397,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3155187" xml-lang="en-US" l10n="E">
-<image id="img_id3153318" src="res/commandimagelist/sc_print.png" width="0.566cm" height="0.566cm"><alt id="alt_id3153318" xml-lang="en-US">Icon</alt>
+<image id="img_id3153318" src="cmd/sc_print.png" width="0.566cm" height="0.566cm"><alt id="alt_id3153318" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -415,7 +415,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3153068" xml-lang="en-US" l10n="E">
-<image id="img_id3155362" src="res/commandimagelist/sc_printpagepreview.png" width="0.566cm" height="0.566cm"><alt id="alt_id3155362" xml-lang="en-US">Icon</alt>
+<image id="img_id3155362" src="cmd/sc_printpagepreview.png" width="0.566cm" height="0.566cm"><alt id="alt_id3155362" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/shared/00/00000402.xhp b/helpcontent2/source/text/shared/00/00000402.xhp
index fd9831ea0a..5ee4a7ce82 100644
--- a/helpcontent2/source/text/shared/00/00000402.xhp
+++ b/helpcontent2/source/text/shared/00/00000402.xhp
@@ -49,7 +49,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3155449" xml-lang="en-US" l10n="E">
-<image id="img_id3155577" src="res/commandimagelist/sc_undo.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155577" xml-lang="en-US">Icon</alt>
+<image id="img_id3155577" src="cmd/sc_undo.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155577" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -69,7 +69,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3154938" xml-lang="en-US" l10n="E">
-<image id="img_id3150358" src="res/commandimagelist/sc_redo.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150358" xml-lang="en-US">Icon</alt>
+<image id="img_id3150358" src="cmd/sc_redo.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150358" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -92,7 +92,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3145173" xml-lang="en-US" l10n="E">
-<image id="img_id3145744" src="res/commandimagelist/sc_helpmenu.png" width="0.2228in" height="0.2228in"><alt id="alt_id3145744" xml-lang="en-US">Icon</alt>
+<image id="img_id3145744" src="cmd/sc_helpmenu.png" width="0.2228in" height="0.2228in"><alt id="alt_id3145744" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -113,7 +113,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3154985" xml-lang="en-US" l10n="E">
-<image id="img_id3156441" src="res/commandimagelist/sc_copy.png" width="0.2228in" height="0.2228in"><alt id="alt_id3156441" xml-lang="en-US">Icon</alt>
+<image id="img_id3156441" src="cmd/sc_copy.png" width="0.2228in" height="0.2228in"><alt id="alt_id3156441" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -134,7 +134,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3156106" xml-lang="en-US" l10n="E">
-<image id="img_id3159196" src="res/commandimagelist/sc_paste.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159196" xml-lang="en-US">Icon</alt>
+<image id="img_id3159196" src="cmd/sc_paste.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159196" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -156,7 +156,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3145748" xml-lang="en-US" l10n="E">
-<image id="img_id3153095" src="res/commandimagelist/sc_selectall.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153095" xml-lang="en-US">Icon</alt>
+<image id="img_id3153095" src="cmd/sc_selectall.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153095" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -203,7 +203,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150020" xml-lang="en-US" l10n="E">
-<image id="img_id3149121" src="res/commandimagelist/sc_recsearch.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149121" xml-lang="en-US">Icon</alt>
+<image id="img_id3149121" src="cmd/sc_recsearch.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149121" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -231,7 +231,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3159183" xml-lang="en-US" l10n="E">
-<image id="img_id3154508" src="res/commandimagelist/sc_navigator.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154508" xml-lang="en-US">Icon</alt>
+<image id="img_id3154508" src="cmd/sc_navigator.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154508" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/shared/00/00000403.xhp b/helpcontent2/source/text/shared/00/00000403.xhp
index 8fada8b835..cf01d0592d 100644
--- a/helpcontent2/source/text/shared/00/00000403.xhp
+++ b/helpcontent2/source/text/shared/00/00000403.xhp
@@ -88,7 +88,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153257" xml-lang="en-US" l10n="E">
-<image id="img_id3148473" src="res/commandimagelist/sc_fullscreen.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148473" xml-lang="en-US">Icon</alt>
+<image id="img_id3148473" src="cmd/sc_fullscreen.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148473" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -111,7 +111,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153778" xml-lang="en-US" l10n="E">
-<image id="img_id3153524" src="res/commandimagelist/sc_viewdatasourcebrowser.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153524" xml-lang="en-US">Icon</alt>
+<image id="img_id3153524" src="cmd/sc_viewdatasourcebrowser.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153524" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -131,7 +131,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3152935" xml-lang="en-US" l10n="E">
-<image id="img_id3156422" src="res/commandimagelist/sc_sourceview.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156422" xml-lang="en-US">Icon</alt>
+<image id="img_id3156422" src="cmd/sc_sourceview.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156422" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -144,7 +144,7 @@
 </section>
 <paragraph role="paragraph" id="par_idN1091B" xml-lang="en-US" l10n="NEW"><variable id="grid">Choose <emph>View - Grid</emph> (Impress or Draw) 
 </variable></paragraph>
-<paragraph role="paragraph" id="par_idN1092E" xml-lang="en-US" l10n="NEW"><variable id="guides">Choose <emph>View - Guides</emph> (Impress or Draw) 
+<paragraph role="paragraph" id="par_idN1092E" xml-lang="en-US" l10n="NEW"><variable id="guides">Choose <emph>View - Snap Lines</emph> (Impress or Draw) 
 </variable></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/00/00000404.xhp b/helpcontent2/source/text/shared/00/00000404.xhp
index 780ddb884d..02013da3b4 100644
--- a/helpcontent2/source/text/shared/00/00000404.xhp
+++ b/helpcontent2/source/text/shared/00/00000404.xhp
@@ -68,7 +68,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153527" xml-lang="en-US" l10n="E">
-<image id="img_id3153748" src="res/commandimagelist/sc_bullet.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153748" xml-lang="en-US">Icon</alt>
+<image id="img_id3153748" src="cmd/sc_bullet.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153748" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -103,7 +103,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150254" xml-lang="en-US" l10n="E">
-<image id="img_id3156305" src="res/commandimagelist/sc_insobjctrl.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156305" xml-lang="en-US">Icon</alt>
+<image id="img_id3156305" src="cmd/sc_insobjctrl.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156305" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -123,7 +123,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="E">
-<image id="img_id3146847" src="res/commandimagelist/sc_insertplugin.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146847" xml-lang="en-US">Icon</alt>
+<image id="img_id3146847" src="cmd/sc_insertplugin.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146847" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -151,7 +151,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3148559" xml-lang="en-US" l10n="E">
-<image id="img_id3149933" src="res/commandimagelist/sc_insertobjectstarmath.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149933" xml-lang="en-US">Icon</alt>
+<image id="img_id3149933" src="cmd/sc_insertobjectstarmath.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149933" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -188,7 +188,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3156005" xml-lang="en-US" l10n="E">
-<image id="img_id3153739" src="res/commandimagelist/sc_drawchart.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153739" xml-lang="en-US">Icon</alt>
+<image id="img_id3153739" src="cmd/sc_drawchart.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153739" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -207,7 +207,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145594" xml-lang="en-US" l10n="E">
-<image id="img_id3144764" src="res/commandimagelist/sc_objectcatalog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3144764" xml-lang="en-US">Icon</alt>
+<image id="img_id3144764" src="cmd/sc_objectcatalog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3144764" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -226,7 +226,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3168607" xml-lang="en-US" l10n="E">
-<image id="img_id3147482" src="res/commandimagelist/sc_insertobjectfloatingframe.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147482" xml-lang="en-US">Icon</alt>
+<image id="img_id3147482" src="cmd/sc_insertobjectfloatingframe.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147482" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -247,7 +247,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_idN10DDC" xml-lang="en-US" l10n="NEW">
-<image id="Graphic2" src="res/commandimagelist/sc_fontworkgalleryfloater.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt>
+<image id="Graphic2" src="cmd/sc_fontworkgalleryfloater.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -261,7 +261,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_idN10EA9" xml-lang="en-US" l10n="NEW">
-<image id="Graphic3" src="res/commandimagelist/sc_basicshapes.diamond.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt>
+<image id="Graphic3" src="cmd/sc_basicshapes.diamond.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -275,7 +275,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_idN10EEE" xml-lang="en-US" l10n="NEW">
-<image id="Graphic4" src="res/commandimagelist/sc_symbolshapes.smiley.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt>
+<image id="Graphic4" src="cmd/sc_symbolshapes.smiley.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -289,7 +289,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_idN10F33" xml-lang="en-US" l10n="NEW">
-<image id="Graphic41" src="res/commandimagelist/sc_arrowshapes.left-right-arrow.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt>
+<image id="Graphic41" src="cmd/sc_arrowshapes.left-right-arrow.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -303,7 +303,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_idN10F78" xml-lang="en-US" l10n="NEW">
-<image id="Graphic5" src="res/commandimagelist/sc_flowchartshapes.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt>
+<image id="Graphic5" src="cmd/sc_flowchartshapes.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -317,7 +317,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_idN10FBD" xml-lang="en-US" l10n="NEW">
-<image id="Graphic6" src="res/commandimagelist/sc_calloutshapes.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt>
+<image id="Graphic6" src="cmd/sc_calloutshapes.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -331,7 +331,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_idN11002" xml-lang="en-US" l10n="NEW">
-<image id="Graphic7" src="res/commandimagelist/sc_starshapes.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt>
+<image id="Graphic7" src="cmd/sc_starshapes.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/00/00000406.xhp b/helpcontent2/source/text/shared/00/00000406.xhp
index 46e6d48b79..7cee3c0b20 100644
--- a/helpcontent2/source/text/shared/00/00000406.xhp
+++ b/helpcontent2/source/text/shared/00/00000406.xhp
@@ -46,7 +46,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3153323" xml-lang="en-US" l10n="E">
-<image id="img_id3154894" src="res/commandimagelist/sc_gallery.png" width="0.1665in" height="0.1665in"><alt id="alt_id3154894" xml-lang="en-US">Icon</alt>
+<image id="img_id3154894" src="cmd/sc_gallery.png" width="0.1665in" height="0.1665in"><alt id="alt_id3154894" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -69,7 +69,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3153824" xml-lang="en-US" l10n="E">
-<image id="img_id3153665" src="res/commandimagelist/sc_spelling.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153665" xml-lang="en-US">Icon</alt>
+<image id="img_id3153665" src="cmd/sc_spelling.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153665" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -209,14 +209,14 @@
 </variable></paragraph>
       <paragraph xml-lang="en-US" id="par_idN10C3D" role="paragraph" l10n="NEW"><variable id="java">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Java</emph>
 </variable></paragraph>
-      <paragraph xml-lang="en-US" id="par_id5485702" role="paragraph" l10n="NEW"><variable id="online_update">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Online Update </emph>
-</variable></paragraph>
+<!-- fdo#33468      <paragraph xml-lang="en-US" id="par_id5485702" role="paragraph" l10n="NEW"><variable id="online_update">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Online Update </emph>
+</variable></paragraph> -->
       <paragraph xml-lang="en-US" id="par_id3146989" role="paragraph" l10n="U" oldref="152"><variable id="accessibility">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Accessibility</emph>
 </variable></paragraph>
       <paragraph xml-lang="en-US" id="par_id3144746" role="paragraph" l10n="U" oldref="153"><variable id="appearance">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Appearance</emph>
 </variable></paragraph>
-      <paragraph xml-lang="en-US" id="par_id0526200904120665" role="paragraph" l10n="NEW"><variable id="improvement">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Improvement Program</emph>
-</variable></paragraph>
+<!-- fdo#33468      <paragraph xml-lang="en-US" id="par_id0526200904120665" role="paragraph" l10n="NEW"><variable id="improvement">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Improvement Program</emph>
+</variable></paragraph> -->
       <paragraph xml-lang="en-US" id="par_id3156355" role="paragraph" l10n="U" oldref="32"><variable id="landen">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save</emph>
 </variable></paragraph>
       <paragraph xml-lang="en-US" id="par_id3147223" role="paragraph" l10n="U" oldref="27"><variable id="rsave">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - General</emph>
diff --git a/helpcontent2/source/text/shared/00/00000407.xhp b/helpcontent2/source/text/shared/00/00000407.xhp
index f2ac95df43..f2ac95df43 100755..100644
--- a/helpcontent2/source/text/shared/00/00000407.xhp
+++ b/helpcontent2/source/text/shared/00/00000407.xhp
diff --git a/helpcontent2/source/text/shared/00/00000408.xhp b/helpcontent2/source/text/shared/00/00000408.xhp
index 161eec726b..161eec726b 100755..100644
--- a/helpcontent2/source/text/shared/00/00000408.xhp
+++ b/helpcontent2/source/text/shared/00/00000408.xhp
diff --git a/helpcontent2/source/text/shared/00/00000409.xhp b/helpcontent2/source/text/shared/00/00000409.xhp
index d334819870..c910bd85da 100644
--- a/helpcontent2/source/text/shared/00/00000409.xhp
+++ b/helpcontent2/source/text/shared/00/00000409.xhp
@@ -51,7 +51,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3155619" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_formfiltered.png" id="img_id3147588"><alt xml-lang="en-US" id="alt_id3147588">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3155619" xml-lang="en-US" oldref=""><image src="cmd/sc_formfiltered.png" id="img_id3147588"><alt xml-lang="en-US" id="alt_id3147588">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3148731" l10n="U" xml-lang="en-US" oldref="5">Standard Filter</paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000450.xhp b/helpcontent2/source/text/shared/00/00000450.xhp
index 3d812364fe..f09110bb56 100644
--- a/helpcontent2/source/text/shared/00/00000450.xhp
+++ b/helpcontent2/source/text/shared/00/00000450.xhp
@@ -93,7 +93,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3151245" xml-lang="en-US" l10n="E">
-<image id="img_id3153063" src="res/commandimagelist/sc_addtable.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153063" xml-lang="en-US">Icon</alt>
+<image id="img_id3153063" src="cmd/sc_addtable.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153063" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -107,7 +107,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149457" xml-lang="en-US" l10n="E">
-<image id="img_id3147282" src="res/commandimagelist/sc_dbaddrelation.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147282" xml-lang="en-US">Icon</alt>
+<image id="img_id3147282" src="cmd/sc_dbaddrelation.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147282" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -124,7 +124,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3157962" xml-lang="en-US" l10n="E">
-<image id="img_id3145419" src="res/commandimagelist/sc_recsearch.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145419" xml-lang="en-US">Icon</alt>
+<image id="img_id3145419" src="cmd/sc_recsearch.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145419" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -142,7 +142,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150393" xml-lang="en-US" l10n="E">
-<image id="img_id3145606" src="res/commandimagelist/sc_tablesort.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145606" xml-lang="en-US">Icon</alt>
+<image id="img_id3145606" src="cmd/sc_tablesort.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145606" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/00/00040500.xhp b/helpcontent2/source/text/shared/00/00040500.xhp
index ec099022ec..a51fb0860c 100644
--- a/helpcontent2/source/text/shared/00/00040500.xhp
+++ b/helpcontent2/source/text/shared/00/00040500.xhp
@@ -39,7 +39,7 @@
    </meta>
    <body>
       <paragraph xml-lang="en-US" id="hd_id3150347" role="heading" level="1" l10n="U" oldref="1">Format Menu</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3145356" role="paragraph" l10n="CHG" oldref="8"><variable id="standard">Choose <emph>Format - Default Formatting</emph>
+      <paragraph xml-lang="en-US" id="par_id3145356" role="paragraph" l10n="CHG" oldref="8"><variable id="standard">Choose <emph>Format - Clear Direct Formatting</emph>
 </variable></paragraph>
       <section id="zeichen">
          <paragraph xml-lang="en-US" id="par_id3153244" role="paragraph" l10n="U" oldref="9">Choose <emph>Format - Character</emph>
@@ -50,7 +50,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3148998" role="paragraph" l10n="E">
-<image id="img_id3154894" src="res/commandimagelist/sc_outlineformat.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3154894">Icon</alt>
+<image id="img_id3154894" src="cmd/sc_outlineformat.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3154894">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -115,7 +115,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3155995" role="paragraph" l10n="E">
-<image id="img_id3150495" src="res/commandimagelist/sc_paragraphdialog.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150495">Icon</alt>
+<image id="img_id3150495" src="cmd/sc_paragraphdialog.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150495">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -195,7 +195,7 @@
             <tablerow>
                <tablecell>
                   <paragraph xml-lang="en-US" id="par_id3148533" role="paragraph" l10n="E">
-<image id="img_id3149568" src="res/commandimagelist/sc_designerdialog.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3149568">Icon</alt>
+<image id="img_id3149568" src="cmd/sc_designerdialog.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3149568">Icon</alt>
 	</image></paragraph>
                </tablecell>
                <tablecell>
@@ -216,7 +216,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3109845" role="paragraph" l10n="E">
-<image id="img_id3159236" src="res/commandimagelist/sc_window3d.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3159236">Icon</alt>
+<image id="img_id3159236" src="cmd/sc_window3d.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3159236">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -248,7 +248,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3149445" role="paragraph" l10n="E">
-<image id="img_id3149964" src="res/commandimagelist/sc_defaultbullet.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3149964">Icon</alt>
+<image id="img_id3149964" src="cmd/sc_defaultbullet.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3149964">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -307,7 +307,7 @@
             <tablerow>
                <tablecell>
                   <paragraph xml-lang="en-US" id="par_id3149953" role="paragraph" l10n="E">
-<image id="img_id3155092" src="res/commandimagelist/sc_grafattrcrop.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3155092">Icon</alt>
+<image id="img_id3155092" src="cmd/sc_grafattrcrop.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3155092">Icon</alt>
 	</image></paragraph>
                </tablecell>
                <tablecell>
@@ -322,7 +322,7 @@
       <section id="grossklein">
          <paragraph xml-lang="en-US" id="par_id3151254" role="paragraph" l10n="CHG" oldref="195">Choose <emph>Format - Change Case</emph>
 </paragraph>
-         <paragraph xml-lang="en-US" id="par_id3159624" role="paragraph" l10n="U" oldref="196">Open context menu (text) - choose <emph>Case/Characters</emph>
+         <paragraph xml-lang="en-US" id="par_id3159624" role="paragraph" l10n="U" oldref="196">Open context menu (text) - choose <emph>~Change Case</emph>
 </paragraph>
       </section>
       <section id="ruby">
diff --git a/helpcontent2/source/text/shared/00/00040501.xhp b/helpcontent2/source/text/shared/00/00040501.xhp
index 3e5793730b..d4806eefdd 100644
--- a/helpcontent2/source/text/shared/00/00040501.xhp
+++ b/helpcontent2/source/text/shared/00/00040501.xhp
@@ -61,7 +61,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3151054" xml-lang="en-US" l10n="E">
-<image id="img_id3150865" src="res/commandimagelist/sc_showpropbrowser.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3150865" xml-lang="en-US">Icon</alt>
+<image id="img_id3150865" src="cmd/sc_showpropbrowser.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3150865" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -79,7 +79,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3152933" xml-lang="en-US" l10n="E">
-<image id="img_id3148676" src="res/commandimagelist/sc_formproperties.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3148676" xml-lang="en-US">Icon</alt>
+<image id="img_id3148676" src="cmd/sc_formproperties.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3148676" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -114,7 +114,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153953" xml-lang="en-US" l10n="E">
-<image id="img_id3149064" src="res/commandimagelist/sc_showbrowser.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3149064" xml-lang="en-US">Icon</alt>
+<image id="img_id3149064" src="cmd/sc_showbrowser.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3149064" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -144,7 +144,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3157874" xml-lang="en-US" l10n="E">
-<image id="img_id3159345" src="res/commandimagelist/sc_tabdialog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159345" xml-lang="en-US">Icon</alt>
+<image id="img_id3159345" src="cmd/sc_tabdialog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159345" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -162,7 +162,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3156439" xml-lang="en-US" l10n="E">
-<image id="img_id3153530" src="res/commandimagelist/sc_addfield.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153530" xml-lang="en-US">Icon</alt>
+<image id="img_id3153530" src="cmd/sc_addfield.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153530" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -180,7 +180,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150749" xml-lang="en-US" l10n="E">
-<image id="img_id3157869" src="res/commandimagelist/sc_showfmexplorer.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3157869" xml-lang="en-US">Icon</alt>
+<image id="img_id3157869" src="cmd/sc_showfmexplorer.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3157869" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -198,7 +198,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3156056" xml-lang="en-US" l10n="E">
-<image id="img_id3154508" src="res/commandimagelist/sc_testmode.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154508" xml-lang="en-US">Icon</alt>
+<image id="img_id3154508" src="cmd/sc_testmode.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154508" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -218,7 +218,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149822" xml-lang="en-US" l10n="E">
-<image id="img_id3151189" src="res/commandimagelist/sc_openreadonly.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151189" xml-lang="en-US">Icon</alt>
+<image id="img_id3151189" src="cmd/sc_openreadonly.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151189" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -236,7 +236,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3152948" xml-lang="en-US" l10n="E">
-<image id="img_id3156375" src="res/commandimagelist/sc_usewizards.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156375" xml-lang="en-US">Icon</alt>
+<image id="img_id3156375" src="cmd/sc_usewizards.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156375" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -255,7 +255,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155578" xml-lang="en-US" l10n="E">
-<image id="img_id3109842" src="res/commandimagelist/sc_bringtofront.png" width="0.222inch" height="0.222inch"><alt id="alt_id3109842" xml-lang="en-US">Icon</alt>
+<image id="img_id3109842" src="cmd/sc_bringtofront.png" width="0.222inch" height="0.222inch"><alt id="alt_id3109842" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -275,7 +275,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3151213" xml-lang="en-US" l10n="E">
-<image id="img_id3145220" src="res/commandimagelist/sc_bringtofront.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145220" xml-lang="en-US">Icon</alt>
+<image id="img_id3145220" src="cmd/sc_bringtofront.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145220" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -295,7 +295,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3159121" xml-lang="en-US" l10n="E">
-<image id="img_id3156142" src="res/commandimagelist/sc_forward.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156142" xml-lang="en-US">Icon</alt>
+<image id="img_id3156142" src="cmd/sc_forward.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156142" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -314,7 +314,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3152994" xml-lang="en-US" l10n="E">
-<image id="img_id3163723" src="res/commandimagelist/sc_backward.png" width="0.222inch" height="0.222inch"><alt id="alt_id3163723" xml-lang="en-US">Icon</alt>
+<image id="img_id3163723" src="cmd/sc_backward.png" width="0.222inch" height="0.222inch"><alt id="alt_id3163723" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -334,7 +334,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145384" xml-lang="en-US" l10n="E">
-<image id="img_id3153813" src="res/commandimagelist/sc_sendtoback.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153813" xml-lang="en-US">Icon</alt>
+<image id="img_id3153813" src="cmd/sc_sendtoback.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153813" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -353,7 +353,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149408" xml-lang="en-US" l10n="E">
-<image id="img_id3155129" src="res/commandimagelist/sc_setobjecttoforeground.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155129" xml-lang="en-US">Icon</alt>
+<image id="img_id3155129" src="cmd/sc_setobjecttoforeground.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155129" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -372,7 +372,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153815" xml-lang="en-US" l10n="E">
-<image id="img_id3154954" src="res/commandimagelist/sc_setobjecttobackground.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154954" xml-lang="en-US">Icon</alt>
+<image id="img_id3154954" src="cmd/sc_setobjecttobackground.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154954" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -398,7 +398,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153373" xml-lang="en-US" l10n="E">
-<image id="img_id3159209" src="res/commandimagelist/sc_objectalign.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159209" xml-lang="en-US">Icon</alt>
+<image id="img_id3159209" src="cmd/sc_objectalign.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159209" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -418,7 +418,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149519" xml-lang="en-US" l10n="E">
-<image id="img_id3143222" src="res/commandimagelist/sc_alignmiddle.png" width="0.222inch" height="0.222inch"><alt id="alt_id3143222" xml-lang="en-US">Icon</alt>
+<image id="img_id3143222" src="cmd/sc_alignmiddle.png" width="0.222inch" height="0.222inch"><alt id="alt_id3143222" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -439,7 +439,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155436" xml-lang="en-US" l10n="E">
-<image id="img_id3153283" src="res/commandimagelist/sc_objectalignright.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153283" xml-lang="en-US">Icon</alt>
+<image id="img_id3153283" src="cmd/sc_objectalignright.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153283" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -460,7 +460,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155386" xml-lang="en-US" l10n="E">
-<image id="img_id3155542" src="res/commandimagelist/sc_alignup.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155542" xml-lang="en-US">Icon</alt>
+<image id="img_id3155542" src="cmd/sc_alignup.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155542" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -481,7 +481,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145755" xml-lang="en-US" l10n="E">
-<image id="img_id3146776" src="res/commandimagelist/sc_aligncenter.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146776" xml-lang="en-US">Icon</alt>
+<image id="img_id3146776" src="cmd/sc_aligncenter.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146776" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -501,7 +501,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154057" xml-lang="en-US" l10n="E">
-<image id="img_id3147267" src="res/commandimagelist/sc_aligndown.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147267" xml-lang="en-US">Icon</alt>
+<image id="img_id3147267" src="cmd/sc_aligndown.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147267" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -522,7 +522,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3151122" xml-lang="en-US" l10n="E">
-<image id="img_id3145357" src="res/commandimagelist/sc_toggleanchortype.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145357" xml-lang="en-US">Icon</alt>
+<image id="img_id3145357" src="cmd/sc_toggleanchortype.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145357" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/00/00040502.xhp b/helpcontent2/source/text/shared/00/00040502.xhp
index 9851cd999b..0c05ad51b9 100644
--- a/helpcontent2/source/text/shared/00/00040502.xhp
+++ b/helpcontent2/source/text/shared/00/00040502.xhp
@@ -49,7 +49,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3148889" role="paragraph" l10n="E">
-<image id="img_id3150669" src="res/commandimagelist/sc_formatline.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150669">Icon</alt>
+<image id="img_id3150669" src="cmd/sc_formatline.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150669">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -92,7 +92,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3156424" role="paragraph" l10n="E">
-<image id="img_id3150868" src="res/commandimagelist/sc_fillstyle.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150868">Icon</alt>
+<image id="img_id3150868" src="cmd/sc_fillstyle.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150868">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -178,7 +178,7 @@
             <tablerow>
                <tablecell>
                   <paragraph xml-lang="en-US" id="par_id3153052" role="paragraph" l10n="E">
-<image id="img_id3150965" src="res/commandimagelist/sc_transformdialog.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150965">Icon</alt>
+<image id="img_id3150965" src="cmd/sc_transformdialog.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150965">Icon</alt>
 	</image></paragraph>
                </tablecell>
                <tablecell>
@@ -208,7 +208,7 @@
             <tablerow>
                <tablecell>
                   <paragraph xml-lang="en-US" id="par_id3148495" role="paragraph" l10n="E">
-<image id="img_id3146898" src="res/commandimagelist/sc_toggleobjectrotatemode.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3146898">Icon</alt>
+<image id="img_id3146898" src="cmd/sc_toggleobjectrotatemode.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3146898">Icon</alt>
 	</image></paragraph>
                </tablecell>
                <tablecell>
@@ -240,7 +240,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3150044" role="paragraph" l10n="E">
-<image id="img_id3147100" src="res/commandimagelist/sc_toggleobjectbeziermode.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3147100">Icon</alt>
+<image id="img_id3147100" src="cmd/sc_toggleobjectbeziermode.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3147100">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -272,7 +272,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3145766" role="paragraph" l10n="E">
-<image id="img_id3156558" src="res/commandimagelist/sc_bold.png" width="0.2228in" height="0.2228in" localize="true"><alt xml-lang="en-US" id="alt_id3156558">Icon</alt>
+<image id="img_id3156558" src="cmd/sc_bold.png" width="0.2228in" height="0.2228in" localize="true"><alt xml-lang="en-US" id="alt_id3156558">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -291,7 +291,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3159091" role="paragraph" l10n="E">
-<image id="img_id3155578" src="res/commandimagelist/sc_italic.png" width="0.2228in" height="0.2228in" localize="true"><alt xml-lang="en-US" id="alt_id3155578">Icon</alt>
+<image id="img_id3155578" src="cmd/sc_italic.png" width="0.2228in" height="0.2228in" localize="true"><alt xml-lang="en-US" id="alt_id3155578">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -310,7 +310,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3145223" role="paragraph" l10n="E">
-<image id="img_id3151068" src="res/commandimagelist/sc_underline.png" width="0.2228in" height="0.2228in" localize="true"><alt xml-lang="en-US" id="alt_id3151068">Icon</alt>
+<image id="img_id3151068" src="cmd/sc_underline.png" width="0.2228in" height="0.2228in" localize="true"><alt xml-lang="en-US" id="alt_id3151068">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -366,7 +366,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3147310" role="paragraph" l10n="E">
-<image id="img_id3155370" src="res/commandimagelist/sc_alignleft.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3155370">Icon</alt>
+<image id="img_id3155370" src="cmd/sc_alignleft.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3155370">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -386,7 +386,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3149408" role="paragraph" l10n="E">
-<image id="img_id3154421" src="res/commandimagelist/sc_alignright.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3154421">Icon</alt>
+<image id="img_id3154421" src="cmd/sc_alignright.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3154421">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -406,7 +406,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3153815" role="paragraph" l10n="E">
-<image id="img_id3149757" src="res/commandimagelist/sc_centerpara.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3149757">Icon</alt>
+<image id="img_id3149757" src="cmd/sc_centerpara.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3149757">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -427,7 +427,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3156189" role="paragraph" l10n="E">
-<image id="img_id3145308" src="res/commandimagelist/sc_justifypara.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3145308">Icon</alt>
+<image id="img_id3145308" src="cmd/sc_justifypara.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3145308">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -455,7 +455,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3146858" role="paragraph" l10n="E">
-<image id="img_id3154344" src="res/commandimagelist/sc_formatgroup.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3154344">Icon</alt>
+<image id="img_id3154344" src="cmd/sc_formatgroup.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3154344">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -476,7 +476,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3151300" role="paragraph" l10n="E">
-<image id="img_id3150831" src="res/commandimagelist/sc_formatungroup.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150831">Icon</alt>
+<image id="img_id3150831" src="cmd/sc_formatungroup.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150831">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -497,7 +497,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3158402" role="paragraph" l10n="E">
-<image id="img_id3149422" src="res/commandimagelist/sc_leavegroup.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3149422">Icon</alt>
+<image id="img_id3149422" src="cmd/sc_leavegroup.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3149422">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -518,7 +518,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3152388" role="paragraph" l10n="E">
-<image id="img_id3149900" src="res/commandimagelist/sc_entergroup.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3149900">Icon</alt>
+<image id="img_id3149900" src="cmd/sc_entergroup.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3149900">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
diff --git a/helpcontent2/source/text/shared/01/01010001.xhp b/helpcontent2/source/text/shared/01/01010001.xhp
index c55928fe8e..c55928fe8e 100755..100644
--- a/helpcontent2/source/text/shared/01/01010001.xhp
+++ b/helpcontent2/source/text/shared/01/01010001.xhp
diff --git a/helpcontent2/source/text/shared/01/01010100.xhp b/helpcontent2/source/text/shared/01/01010100.xhp
index 62ac0a4734..fa95225685 100644
--- a/helpcontent2/source/text/shared/01/01010100.xhp
+++ b/helpcontent2/source/text/shared/01/01010100.xhp
@@ -99,7 +99,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154346" xml-lang="en-US" l10n="E">
-<image id="img_id3148663" src="res/commandimagelist/sc_print.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148663" xml-lang="en-US">Icon</alt>
+<image id="img_id3148663" src="cmd/sc_print.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148663" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/01/01010303.xhp b/helpcontent2/source/text/shared/01/01010303.xhp
index 65ea8b50b7..65ea8b50b7 100755..100644
--- a/helpcontent2/source/text/shared/01/01010303.xhp
+++ b/helpcontent2/source/text/shared/01/01010303.xhp
diff --git a/helpcontent2/source/text/shared/01/01020103.xhp b/helpcontent2/source/text/shared/01/01020103.xhp
index cfa54f4586..cfa54f4586 100755..100644
--- a/helpcontent2/source/text/shared/01/01020103.xhp
+++ b/helpcontent2/source/text/shared/01/01020103.xhp
diff --git a/helpcontent2/source/text/shared/01/01110000.xhp b/helpcontent2/source/text/shared/01/01110000.xhp
index f247164cae..f247164cae 100755..100644
--- a/helpcontent2/source/text/shared/01/01110000.xhp
+++ b/helpcontent2/source/text/shared/01/01110000.xhp
diff --git a/helpcontent2/source/text/shared/01/01130000.xhp b/helpcontent2/source/text/shared/01/01130000.xhp
index 3e26baa65d..498264c1c9 100644
--- a/helpcontent2/source/text/shared/01/01130000.xhp
+++ b/helpcontent2/source/text/shared/01/01130000.xhp
@@ -130,7 +130,7 @@
 <paragraph xml-lang="en-US" id="par_id16" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specify where to print comments (if any).</ahelp></paragraph>
 
 <bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintAnnotationMode:ListBox" id="bm_id17" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id18" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">"Specify where to print comments (if any)."</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id18" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specify where to print comments (if any).</ahelp></paragraph>
 
 
 <comment>Math:</comment>
diff --git a/helpcontent2/source/text/shared/01/02100000.xhp b/helpcontent2/source/text/shared/01/02100000.xhp
index 227fa3f74d..872e8bb512 100644
--- a/helpcontent2/source/text/shared/01/02100000.xhp
+++ b/helpcontent2/source/text/shared/01/02100000.xhp
@@ -136,7 +136,7 @@ Ext help text not found within switches. Solution: Keep switched text for normal
       <paragraph xml-lang="en-US" id="par_id3155103" role="paragraph" l10n="CHG" oldref="50"><ahelp hid="SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_LAYOUTS">Searches for text formatted with the style that you specify. Select this checkbox, and then select a style from the <emph>Search for </emph>list. To specify a replacement style, select a style from the <emph>Replace with</emph> list.</ahelp></paragraph>
       <paragraph xml-lang="en-US" id="par_idN109CC" role="note" l10n="NEW">After you select the attributes that you want to search for, the <emph>Search for Styles</emph> box in the <emph>Options </emph>area of the %PRODUCTNAME Writer <emph>Find &amp; Replace </emph>dialog changes to <emph>Including Styles</emph>.</paragraph>
       <paragraph xml-lang="en-US" id="par_idN109DF" role="note" l10n="NEW">If you want to search for text in which attributes were set by using direct formatting and styles, select the <emph>Including Styles</emph> box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_SEARCH:CB_NOTES" id="bm_id0302200901445934" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXDLG_SEARCH:CB_COMMENTS" id="bm_id0302200901445934" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id0302200901464169" role="heading" level="3" l10n="NEW">Comments</paragraph>
       <paragraph xml-lang="en-US" id="par_id0302200901464150" role="paragraph" l10n="NEW"><ahelp hid=".">In Writer, you can select to include the comment texts in your searches.</ahelp></paragraph>
       <embed href="text/shared/guide/find_attributes.xhp#find_attributes"/>
diff --git a/helpcontent2/source/text/shared/01/02100001.xhp b/helpcontent2/source/text/shared/01/02100001.xhp
index c68e45bfdd..c68e45bfdd 100755..100644
--- a/helpcontent2/source/text/shared/01/02100001.xhp
+++ b/helpcontent2/source/text/shared/01/02100001.xhp
diff --git a/helpcontent2/source/text/shared/01/02180100.xhp b/helpcontent2/source/text/shared/01/02180100.xhp
index c5604a98e9..c5604a98e9 100755..100644
--- a/helpcontent2/source/text/shared/01/02180100.xhp
+++ b/helpcontent2/source/text/shared/01/02180100.xhp
diff --git a/helpcontent2/source/text/shared/01/02200100.xhp b/helpcontent2/source/text/shared/01/02200100.xhp
index 50ee2e808b..50ee2e808b 100755..100644
--- a/helpcontent2/source/text/shared/01/02200100.xhp
+++ b/helpcontent2/source/text/shared/01/02200100.xhp
diff --git a/helpcontent2/source/text/shared/01/02200200.xhp b/helpcontent2/source/text/shared/01/02200200.xhp
index f29c803241..f29c803241 100755..100644
--- a/helpcontent2/source/text/shared/01/02200200.xhp
+++ b/helpcontent2/source/text/shared/01/02200200.xhp
diff --git a/helpcontent2/source/text/shared/01/02210101.xhp b/helpcontent2/source/text/shared/01/02210101.xhp
index f62b17fa76..f62b17fa76 100755..100644
--- a/helpcontent2/source/text/shared/01/02210101.xhp
+++ b/helpcontent2/source/text/shared/01/02210101.xhp
diff --git a/helpcontent2/source/text/shared/01/02220000.xhp b/helpcontent2/source/text/shared/01/02220000.xhp
index a2014ce2f5..88a2598a5c 100644
--- a/helpcontent2/source/text/shared/01/02220000.xhp
+++ b/helpcontent2/source/text/shared/01/02220000.xhp
@@ -70,7 +70,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149795" xml-lang="en-US" l10n="E">
-<image id="img_id3155503" src="res/commandimagelist/sc_open.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155503" xml-lang="en-US">Icon</alt>
+<image id="img_id3155503" src="cmd/sc_open.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155503" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -84,7 +84,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154280" xml-lang="en-US" l10n="E">
-<image id="img_id3154923" src="res/commandimagelist/sc_saveas.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154923" xml-lang="en-US">Icon</alt>
+<image id="img_id3154923" src="cmd/sc_saveas.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154923" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -98,7 +98,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3156214" xml-lang="en-US" l10n="E">
-<image id="img_id3153192" src="res/commandimagelist/sc_drawselect.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153192" xml-lang="en-US">Icon</alt>
+<image id="img_id3153192" src="cmd/sc_drawselect.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153192" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -112,7 +112,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150769" xml-lang="en-US" l10n="E">
-<image id="img_id3154297" src="res/commandimagelist/sc_rect.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154297" xml-lang="en-US">Icon</alt>
+<image id="img_id3154297" src="cmd/sc_rect.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154297" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -126,7 +126,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155308" xml-lang="en-US" l10n="E">
-<image id="img_id3154011" src="res/commandimagelist/sc_ellipse.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154011" xml-lang="en-US">Icon</alt>
+<image id="img_id3154011" src="cmd/sc_ellipse.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154011" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -140,7 +140,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3148577" xml-lang="en-US" l10n="E">
-<image id="img_id3156005" src="res/commandimagelist/sc_polygon.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156005" xml-lang="en-US">Icon</alt>
+<image id="img_id3156005" src="cmd/sc_polygon.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156005" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -154,7 +154,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153877" xml-lang="en-US" l10n="E">
-<image id="img_id3148386" src="res/commandimagelist/sc_freeline.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148386" xml-lang="en-US">Icon</alt>
+<image id="img_id3148386" src="cmd/sc_freeline.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148386" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -168,7 +168,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145801" xml-lang="en-US" l10n="E">
-<image id="img_id3150113" src="res/commandimagelist/sc_toggleobjectbeziermode.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150113" xml-lang="en-US">Icon</alt>
+<image id="img_id3150113" src="cmd/sc_toggleobjectbeziermode.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150113" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -182,7 +182,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3146971" xml-lang="en-US" l10n="E">
-<image id="img_id3148570" src="res/commandimagelist/sc_beziermove.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148570" xml-lang="en-US">Icon</alt>
+<image id="img_id3148570" src="cmd/sc_beziermove.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148570" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -196,7 +196,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150749" xml-lang="en-US" l10n="E">
-<image id="img_id3146793" src="res/commandimagelist/sc_bezierinsert.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146793" xml-lang="en-US">Icon</alt>
+<image id="img_id3146793" src="cmd/sc_bezierinsert.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146793" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -210,7 +210,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149021" xml-lang="en-US" l10n="E">
-<image id="img_id3154508" src="res/commandimagelist/sc_bezierdelete.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154508" xml-lang="en-US">Icon</alt>
+<image id="img_id3154508" src="cmd/sc_bezierdelete.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154508" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -238,7 +238,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145769" xml-lang="en-US" l10n="E">
-<image id="img_id3153922" src="res/commandimagelist/sc_choosemacro.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153922" xml-lang="en-US">Icon</alt>
+<image id="img_id3153922" src="cmd/sc_choosemacro.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153922" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -252,7 +252,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3159104" xml-lang="en-US" l10n="E">
-<image id="img_id3149735" src="res/commandimagelist/sc_modifyframe.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149735" xml-lang="en-US">Icon</alt>
+<image id="img_id3149735" src="cmd/sc_modifyframe.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149735" xml-lang="en-US">Icon</alt>
 	</image><comment>UFI: see #60783</comment></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/01/02230000.xhp b/helpcontent2/source/text/shared/01/02230000.xhp
index 506c4a233f..506c4a233f 100755..100644
--- a/helpcontent2/source/text/shared/01/02230000.xhp
+++ b/helpcontent2/source/text/shared/01/02230000.xhp
diff --git a/helpcontent2/source/text/shared/01/02230402.xhp b/helpcontent2/source/text/shared/01/02230402.xhp
index d0e048bd8a..2a348bb812 100644
--- a/helpcontent2/source/text/shared/01/02230402.xhp
+++ b/helpcontent2/source/text/shared/01/02230402.xhp
@@ -61,7 +61,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3159147" xml-lang="en-US" l10n="E">
-<image id="img_id3150771" src="res/commandimagelist/sc_timefield.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150771" xml-lang="en-US">Icon</alt>
+<image id="img_id3150771" src="cmd/sc_timefield.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150771" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/01/03150100.xhp b/helpcontent2/source/text/shared/01/03150100.xhp
index e7ada31524..e7ada31524 100755..100644
--- a/helpcontent2/source/text/shared/01/03150100.xhp
+++ b/helpcontent2/source/text/shared/01/03150100.xhp
diff --git a/helpcontent2/source/text/shared/01/04110000.xhp b/helpcontent2/source/text/shared/01/04110000.xhp
deleted file mode 100644
index 59fcf6f936..0000000000
--- a/helpcontent2/source/text/shared/01/04110000.xhp
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
- *
- * 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.
- *
- ************************************************************************-->
-	
-<helpdocument version="1.0">
-<meta>
-<topic id="textshared0104110000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Hyperlink Bar</title>
-<filename>/text/shared/01/04110000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-05-24T13:20:42">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="hyperlink">
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertHyperlink" id="bm_id9199631" localize="false"/><!-- HID added by script -->
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertHyperlink" id="bm_id3155577" localize="false"/>
-<paragraph role="heading" id="hd_id3143272" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/04110000.xhp" name="Hyperlink Bar">Hyperlink Bar</link></paragraph>
-<paragraph role="paragraph" id="par_id3150838" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:InsertHyperlink">Shows or hides the<emph> Hyperlink Bar, </emph>where you can insert and edit URLs or search the Internet using keywords.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/shared/00/00000404.xhp#hyper"/>
-</section>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3149511" xml-lang="en-US" l10n="C"><link href="text/shared/main0209.xhp" name="Hyperlink bar">Hyperlink bar</link></paragraph>
-<paragraph role="paragraph" id="par_id3093440" xml-lang="en-US" l10n="C"><link href="text/shared/02/09030000.xhp" name="Inserting hyperlinks">Inserting hyperlinks</link></paragraph>
-<paragraph role="paragraph" id="par_id3154927" xml-lang="en-US" l10n="C"><link href="text/shared/00/00000002.xhp#url" name="URL">URL</link></paragraph>
-</section></body>
-</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/04150000.xhp b/helpcontent2/source/text/shared/01/04150000.xhp
index 7bde2a135f..7bde2a135f 100755..100644
--- a/helpcontent2/source/text/shared/01/04150000.xhp
+++ b/helpcontent2/source/text/shared/01/04150000.xhp
diff --git a/helpcontent2/source/text/shared/01/04990000.xhp b/helpcontent2/source/text/shared/01/04990000.xhp
index d9e3dd2c4b..d9e3dd2c4b 100755..100644
--- a/helpcontent2/source/text/shared/01/04990000.xhp
+++ b/helpcontent2/source/text/shared/01/04990000.xhp
diff --git a/helpcontent2/source/text/shared/01/05010000.xhp b/helpcontent2/source/text/shared/01/05010000.xhp
index ed5b71b159..7f1d8317cf 100644
--- a/helpcontent2/source/text/shared/01/05010000.xhp
+++ b/helpcontent2/source/text/shared/01/05010000.xhp
@@ -35,7 +35,7 @@
 		<helpdocument version="1.0">
 <meta>
 <topic id="textshared0105010000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Default Formatting</title>
+<title id="tit" xml-lang="en-US">Clear Direct Formatting</title>
 <filename>/text/shared/01/05010000.xhp</filename>
 </topic>
 </meta>
@@ -52,7 +52,8 @@
 <bookmark xml-lang="en-US" branch="hid/.uno:SetDefault" id="bm_id3154840" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:StandardTextAttributes" id="bm_id2575480" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:StandardTextAttributes" id="bm_id3150008" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ResetAttributes" id="bm_id6007568" localize="false"/><paragraph role="heading" id="hd_id3153391" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/05010000.xhp" name="Default Formatting">Default Formatting</link></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.uno:ResetAttributes" id="bm_id6007568" localize="false"/><paragraph role="heading" id="hd_id3153391" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/05010000.xhp" name="Clear Direct Formatting">Clear Direct Formatting</link></paragraph>
 <paragraph role="paragraph" id="par_id3145829" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:StandardTextAttributes">Removes direct formatting and formatting by character styles from the selection.</ahelp></paragraph>
 </section>
 <paragraph role="paragraph" id="par_id3147261" xml-lang="en-US" l10n="U" oldref="5"><switchinline select="appl"><caseinline select="CHART">
@@ -61,10 +62,8 @@
 <embed href="text/shared/00/00040500.xhp#standard"/>
 </section>
 <switch select="appl">
-<case select="WRITER"><paragraph role="tip" id="par_id3157959" xml-lang="en-US" l10n="U" oldref="3">To stop applying a direct format, such as underlining, while you type new text at the end of a line, press the right arrow key. </paragraph>
+<case select="WRITER"><paragraph role="tip" id="par_id3157959" xml-lang="en-US" l10n="U" oldref="3">To stop applying a direct format, such as underlining, while you type new text at the end of a line, press Shift+Ctrl+X.</paragraph>
 </case>
 </switch>
-<paragraph role="tip" id="par_id3146797" xml-lang="en-US" l10n="U" oldref="4">You can change all hyperlinks in the selected text back to normal text by choosing <emph>Format - Default Formatting.</emph>
-</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05020301.xhp b/helpcontent2/source/text/shared/01/05020301.xhp
index d89091ae99..dca431ae4a 100644
--- a/helpcontent2/source/text/shared/01/05020301.xhp
+++ b/helpcontent2/source/text/shared/01/05020301.xhp
@@ -902,6 +902,79 @@
 </tablerow>
 </table>
 
+<paragraph role="paragraph" id="par_id3757982" xml-lang="en-US" l10n="U">The display of the hour, minute, and second components of the time is capped at the maximal number of hours in a day (or 12 hour period), minutes in an hour, or seconds in a minute.  To suppress this behavior use square brackets, [ ], as illustrated in the following table.</paragraph>
+<paragraph role="paragraph" id="par_id3157980" xml-lang="en-US" l10n="U">Display of the value 1 day, 1 hour, 25 minutes, 9 seconds</paragraph>
+<table id="tbl_id3154831">
+<tablerow>
+<tablecell>
+<paragraph role="tablehead" id="par_id3757983" xml-lang="en-US" l10n="U">Format Code</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablehead" id="par_id3757984" xml-lang="en-US" l10n="U">Output Displayed</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablehead" id="par_id3757985" xml-lang="en-US" l10n="U"></paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablehead" id="par_id3757986" xml-lang="en-US" l10n="U">Format Code</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablehead" id="par_id3757987" xml-lang="en-US" l10n="U">Output Displayed</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="code" id="par_id3757988" xml-lang="en-US" l10n="U">HH:MM:SS</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id3757989" xml-lang="en-US" l10n="U">01:25:09</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id3757990" xml-lang="en-US" l10n="U"></paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="code" id="par_id3757991" xml-lang="en-US" l10n="U">[HH]:MM:SS</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id3757992" xml-lang="en-US" l10n="U">25:25:09</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="code" id="par_id3757993" xml-lang="en-US" l10n="U">MM:SS</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id3757994" xml-lang="en-US" l10n="U">25:09</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id3757995" xml-lang="en-US" l10n="U"></paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="code" id="par_id3757996" xml-lang="en-US" l10n="U">[MM]:SS</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id3757997" xml-lang="en-US" l10n="U">1525:09</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="code" id="par_id3757998" xml-lang="en-US" l10n="U">SS</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id3757999" xml-lang="en-US" l10n="U">09</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id3758000" xml-lang="en-US" l10n="U"></paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="code" id="par_id3758001" xml-lang="en-US" l10n="U">[SS]</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id3758002" xml-lang="en-US" l10n="U">91509</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
 <paragraph role="note" id="par_id3156039" xml-lang="en-US" l10n="U" oldref="77">To display seconds as fractions, add the decimal delimiter to your number format code. For example, enter <emph>hh:mm:ss.00</emph> to display the time as "01:02:03.45".<comment>Translators: use the decimal delimiter of your language (period or comma) for all number format codes in Calc.</comment></paragraph>
 <paragraph role="paragraph" id="par_id3148649" xml-lang="en-US" l10n="U" oldref="102">If a time is entered in the form 02:03.45 or 01:02:03.45 or 25:01:02, the following formats are assigned if no other time format has been specified: MM:SS.00 or [HH]:MM:SS.00 or [HH]:MM:SS<comment>Translators: use the decimal delimiter of your language (period or comma) for all number format codes in Calc.</comment></paragraph>
 <paragraph role="heading" id="hd_id3158404" xml-lang="en-US" level="2" l10n="U" oldref="169">Displaying Numbers Using Native Characters</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05020600.xhp b/helpcontent2/source/text/shared/01/05020600.xhp
index c5f8a16bb2..c5f8a16bb2 100755..100644
--- a/helpcontent2/source/text/shared/01/05020600.xhp
+++ b/helpcontent2/source/text/shared/01/05020600.xhp
diff --git a/helpcontent2/source/text/shared/01/05020700.xhp b/helpcontent2/source/text/shared/01/05020700.xhp
index ddd710aa6c..ddd710aa6c 100755..100644
--- a/helpcontent2/source/text/shared/01/05020700.xhp
+++ b/helpcontent2/source/text/shared/01/05020700.xhp
diff --git a/helpcontent2/source/text/shared/01/05030800.xhp b/helpcontent2/source/text/shared/01/05030800.xhp
index 89beae9ffb..89beae9ffb 100755..100644
--- a/helpcontent2/source/text/shared/01/05030800.xhp
+++ b/helpcontent2/source/text/shared/01/05030800.xhp
diff --git a/helpcontent2/source/text/shared/01/05050000.xhp b/helpcontent2/source/text/shared/01/05050000.xhp
index 4526e65624..91a8705d91 100644
--- a/helpcontent2/source/text/shared/01/05050000.xhp
+++ b/helpcontent2/source/text/shared/01/05050000.xhp
@@ -38,7 +38,7 @@
 <body>
 <section id="grossklein">
 <bookmark xml-lang="en-US" branch="hid/.uno:TransliterateMenu" id="bm_id668355" localize="false"/>
-<paragraph role="heading" id="hd_id3152952" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/05050000.xhp" name="Case/Characters">Change Case</link></paragraph>
+<paragraph role="heading" id="hd_id3152952" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/05050000.xhp" name="~Change Case">Change Case</link></paragraph>
 <paragraph role="paragraph" id="par_id3151299" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Changes the case of characters in the selection. If the cursor is within a word and no text is selected, then the word is the selection.</ahelp></paragraph>
 </section>
 <section id="howtoget">
diff --git a/helpcontent2/source/text/shared/01/05080000.xhp b/helpcontent2/source/text/shared/01/05080000.xhp
index 5eaa355824..5eaa355824 100755..100644
--- a/helpcontent2/source/text/shared/01/05080000.xhp
+++ b/helpcontent2/source/text/shared/01/05080000.xhp
diff --git a/helpcontent2/source/text/shared/01/05090000.xhp b/helpcontent2/source/text/shared/01/05090000.xhp
index bba07b8c0a..bba07b8c0a 100755..100644
--- a/helpcontent2/source/text/shared/01/05090000.xhp
+++ b/helpcontent2/source/text/shared/01/05090000.xhp
diff --git a/helpcontent2/source/text/shared/01/05100000.xhp b/helpcontent2/source/text/shared/01/05100000.xhp
index 4dca5ec674..4dca5ec674 100755..100644
--- a/helpcontent2/source/text/shared/01/05100000.xhp
+++ b/helpcontent2/source/text/shared/01/05100000.xhp
diff --git a/helpcontent2/source/text/shared/01/05100100.xhp b/helpcontent2/source/text/shared/01/05100100.xhp
index d61f123682..8477c790f1 100644
--- a/helpcontent2/source/text/shared/01/05100100.xhp
+++ b/helpcontent2/source/text/shared/01/05100100.xhp
@@ -58,7 +58,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3153996" xml-lang="en-US" l10n="E">
-<image id="img_id3154002" src="res/commandimagelist/sc_mergecells.png" width="0.423cm" height="0.423cm"><alt id="alt_id3154002" xml-lang="en-US">icon</alt>
+<image id="img_id3154002" src="cmd/sc_mergecells.png" width="0.423cm" height="0.423cm"><alt id="alt_id3154002" xml-lang="en-US">icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/shared/01/05100200.xhp b/helpcontent2/source/text/shared/01/05100200.xhp
index 6e3ce253c8..4ae05ab2e6 100644
--- a/helpcontent2/source/text/shared/01/05100200.xhp
+++ b/helpcontent2/source/text/shared/01/05100200.xhp
@@ -58,7 +58,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3147270" xml-lang="en-US" l10n="E">
-<image id="img_id3147275" src="res/commandimagelist/sc_splitcell.png" width="0.423cm" height="0.423cm"><alt id="alt_id3147275" xml-lang="en-US">Icon</alt>
+<image id="img_id3147275" src="cmd/sc_splitcell.png" width="0.423cm" height="0.423cm"><alt id="alt_id3147275" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/shared/01/05100600.xhp b/helpcontent2/source/text/shared/01/05100600.xhp
index 793e026763..b27ae56190 100644
--- a/helpcontent2/source/text/shared/01/05100600.xhp
+++ b/helpcontent2/source/text/shared/01/05100600.xhp
@@ -40,7 +40,7 @@
 <body>
 <section id="mitte">
 <bookmark xml-lang="en-US" branch="hid/.uno:CellVertCenter" id="bm_id3154766" localize="false"/>
-<paragraph role="heading" id="hd_id3149874" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/05100600.xhp" name="Center (vertical)">Center (vertival)</link></paragraph>
+<paragraph role="heading" id="hd_id3149874" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/05100600.xhp" name="Center (vertical)">Center (vertical)</link></paragraph>
 <paragraph role="paragraph" id="par_id3149048" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Centers the contents of the cell between top and bottom of the cell.</ahelp></paragraph>
 </section>
 <section id="howtoget">
diff --git a/helpcontent2/source/text/shared/01/05110000.xhp b/helpcontent2/source/text/shared/01/05110000.xhp
index feb0ba4bbe..feb0ba4bbe 100755..100644
--- a/helpcontent2/source/text/shared/01/05110000.xhp
+++ b/helpcontent2/source/text/shared/01/05110000.xhp
diff --git a/helpcontent2/source/text/shared/01/05110600m.xhp b/helpcontent2/source/text/shared/01/05110600m.xhp
index fd408a28cb..a9b48c9175 100644
--- a/helpcontent2/source/text/shared/01/05110600m.xhp
+++ b/helpcontent2/source/text/shared/01/05110600m.xhp
@@ -58,7 +58,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3145297" xml-lang="en-US" l10n="E">
-<image id="img_id3155994" src="res/commandimagelist/sc_distributerows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3155994" xml-lang="en-US">Icon</alt>
+<image id="img_id3155994" src="cmd/sc_distributerows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3155994" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/shared/01/05120000.xhp b/helpcontent2/source/text/shared/01/05120000.xhp
index befa57e665..befa57e665 100755..100644
--- a/helpcontent2/source/text/shared/01/05120000.xhp
+++ b/helpcontent2/source/text/shared/01/05120000.xhp
diff --git a/helpcontent2/source/text/shared/01/05120600.xhp b/helpcontent2/source/text/shared/01/05120600.xhp
index d1aeaeaf8b..75fcaf907d 100644
--- a/helpcontent2/source/text/shared/01/05120600.xhp
+++ b/helpcontent2/source/text/shared/01/05120600.xhp
@@ -58,7 +58,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3145179" xml-lang="en-US" l10n="E">
-<image id="img_id3145186" src="res/commandimagelist/sc_distributecolumns.png" width="0.423cm" height="0.423cm"><alt id="alt_id3145186" xml-lang="en-US">Icon</alt>
+<image id="img_id3145186" src="cmd/sc_distributecolumns.png" width="0.423cm" height="0.423cm"><alt id="alt_id3145186" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/shared/01/05150101.xhp b/helpcontent2/source/text/shared/01/05150101.xhp
index 62eaca0bb9..62eaca0bb9 100755..100644
--- a/helpcontent2/source/text/shared/01/05150101.xhp
+++ b/helpcontent2/source/text/shared/01/05150101.xhp
diff --git a/helpcontent2/source/text/shared/01/05210200.xhp b/helpcontent2/source/text/shared/01/05210200.xhp
index 957e420b52..957e420b52 100755..100644
--- a/helpcontent2/source/text/shared/01/05210200.xhp
+++ b/helpcontent2/source/text/shared/01/05210200.xhp
diff --git a/helpcontent2/source/text/shared/01/05210600.xhp b/helpcontent2/source/text/shared/01/05210600.xhp
index 02be0a3c06..7d80d90135 100644
--- a/helpcontent2/source/text/shared/01/05210600.xhp
+++ b/helpcontent2/source/text/shared/01/05210600.xhp
@@ -80,7 +80,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145068" xml-lang="en-US" l10n="E">
-<image id="img_id3149045" src="res/commandimagelist/sc_fillshadow.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149045" xml-lang="en-US">Icon</alt>
+<image id="img_id3149045" src="cmd/sc_fillshadow.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149045" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/01/05210700.xhp b/helpcontent2/source/text/shared/01/05210700.xhp
index b3270015fd..b3270015fd 100755..100644
--- a/helpcontent2/source/text/shared/01/05210700.xhp
+++ b/helpcontent2/source/text/shared/01/05210700.xhp
diff --git a/helpcontent2/source/text/shared/01/05230500.xhp b/helpcontent2/source/text/shared/01/05230500.xhp
index 9d9bc04b06..cd17842d46 100644
--- a/helpcontent2/source/text/shared/01/05230500.xhp
+++ b/helpcontent2/source/text/shared/01/05230500.xhp
@@ -57,7 +57,7 @@
   <embed href="text/shared/00/00040502.xhp#legende"/>
 </section>
 <paragraph role="note" id="par_id368358" xml-lang="en-US" l10n="NEW">These callouts are a legacy of the first versions of %PRODUCTNAME. You must customize a toolbar or menu to insert these callouts. The newer custom shape callouts offer more features, for example a Callouts toolbar 
-<image id="img_id3154508" src="res/commandimagelist/sc_calloutshapes.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154508" xml-lang="en-US">Icon</alt>
+<image id="img_id3154508" src="cmd/sc_calloutshapes.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154508" xml-lang="en-US">Icon</alt>
 	</image> where you can select the shape.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_CAPTION:LB_WINKEL" id="bm_id3153551" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/CUI_HID_CAPTION_CTL_TYPE" id="bm_id3149999" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/05240000.xhp b/helpcontent2/source/text/shared/01/05240000.xhp
index 004887e564..004887e564 100755..100644
--- a/helpcontent2/source/text/shared/01/05240000.xhp
+++ b/helpcontent2/source/text/shared/01/05240000.xhp
diff --git a/helpcontent2/source/text/shared/01/05280000.xhp b/helpcontent2/source/text/shared/01/05280000.xhp
index 90386aa751..9dc7dbb007 100644
--- a/helpcontent2/source/text/shared/01/05280000.xhp
+++ b/helpcontent2/source/text/shared/01/05280000.xhp
@@ -61,7 +61,7 @@ UFI: exclude from indexing</lastedited>
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149244" xml-lang="en-US" l10n="E">
-<image id="img_id3161458" src="res/commandimagelist/sc_fontwork.png" width="0.222inch" height="0.222inch"><alt id="alt_id3161458" xml-lang="en-US">Icon</alt>
+<image id="img_id3161458" src="cmd/sc_fontwork.png" width="0.222inch" height="0.222inch"><alt id="alt_id3161458" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -151,7 +151,7 @@ UFI: exclude from indexing</lastedited>
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3156006" xml-lang="en-US" l10n="E">
-<image id="img_id3153573" src="res/commandimagelist/sc_alignleft.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153573" xml-lang="en-US">Icon</alt>
+<image id="img_id3153573" src="cmd/sc_alignleft.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153573" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -166,7 +166,7 @@ UFI: exclude from indexing</lastedited>
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155748" xml-lang="en-US" l10n="E">
-<image id="img_id3147217" src="res/commandimagelist/sc_centerpara.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147217" xml-lang="en-US">Icon</alt>
+<image id="img_id3147217" src="cmd/sc_centerpara.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147217" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -181,7 +181,7 @@ UFI: exclude from indexing</lastedited>
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149939" xml-lang="en-US" l10n="E">
-<image id="img_id3148498" src="res/commandimagelist/sc_alignright.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148498" xml-lang="en-US">Icon</alt>
+<image id="img_id3148498" src="cmd/sc_alignright.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148498" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/01/05290000.xhp b/helpcontent2/source/text/shared/01/05290000.xhp
index 89f235e2dd..89f235e2dd 100755..100644
--- a/helpcontent2/source/text/shared/01/05290000.xhp
+++ b/helpcontent2/source/text/shared/01/05290000.xhp
diff --git a/helpcontent2/source/text/shared/01/05340400.xhp b/helpcontent2/source/text/shared/01/05340400.xhp
index 013f2eba58..499372e9d2 100644
--- a/helpcontent2/source/text/shared/01/05340400.xhp
+++ b/helpcontent2/source/text/shared/01/05340400.xhp
@@ -113,7 +113,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3151041" xml-lang="en-US" l10n="E">
-<image id="img_id3150740" src="res/commandimagelist/sc_editdoc.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150740" xml-lang="en-US">Icon</alt>
+<image id="img_id3150740" src="cmd/sc_editdoc.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150740" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -133,7 +133,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149266" xml-lang="en-US" l10n="E">
-<image id="img_id3156060" src="res/commandimagelist/sc_firstrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156060" xml-lang="en-US">Icon</alt>
+<image id="img_id3156060" src="cmd/sc_firstrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156060" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -147,7 +147,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3147484" xml-lang="en-US" l10n="E">
-<image id="img_id3156736" src="res/commandimagelist/sc_prevrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156736" xml-lang="en-US">Icon</alt>
+<image id="img_id3156736" src="cmd/sc_prevrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156736" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -164,7 +164,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3151075" xml-lang="en-US" l10n="E">
-<image id="img_id3153214" src="res/commandimagelist/sc_nextrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153214" xml-lang="en-US">Icon</alt>
+<image id="img_id3153214" src="cmd/sc_nextrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153214" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -178,7 +178,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153838" xml-lang="en-US" l10n="E">
-<image id="img_id3156320" src="res/commandimagelist/sc_lastrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156320" xml-lang="en-US">Icon</alt>
+<image id="img_id3156320" src="cmd/sc_lastrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156320" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/01/05340404.xhp b/helpcontent2/source/text/shared/01/05340404.xhp
index c350dd6909..c350dd6909 100755..100644
--- a/helpcontent2/source/text/shared/01/05340404.xhp
+++ b/helpcontent2/source/text/shared/01/05340404.xhp
diff --git a/helpcontent2/source/text/shared/01/05340500.xhp b/helpcontent2/source/text/shared/01/05340500.xhp
index 4b1d3394f0..4b1d3394f0 100755..100644
--- a/helpcontent2/source/text/shared/01/05340500.xhp
+++ b/helpcontent2/source/text/shared/01/05340500.xhp
diff --git a/helpcontent2/source/text/shared/01/05340600.xhp b/helpcontent2/source/text/shared/01/05340600.xhp
index bba3c9745e..bba3c9745e 100755..100644
--- a/helpcontent2/source/text/shared/01/05340600.xhp
+++ b/helpcontent2/source/text/shared/01/05340600.xhp
diff --git a/helpcontent2/source/text/shared/01/06010101.xhp b/helpcontent2/source/text/shared/01/06010101.xhp
index 564704e5e1..564704e5e1 100755..100644
--- a/helpcontent2/source/text/shared/01/06010101.xhp
+++ b/helpcontent2/source/text/shared/01/06010101.xhp
diff --git a/helpcontent2/source/text/shared/01/06010500.xhp b/helpcontent2/source/text/shared/01/06010500.xhp
index 4fe28d170b..4fe28d170b 100755..100644
--- a/helpcontent2/source/text/shared/01/06010500.xhp
+++ b/helpcontent2/source/text/shared/01/06010500.xhp
diff --git a/helpcontent2/source/text/shared/01/06010601.xhp b/helpcontent2/source/text/shared/01/06010601.xhp
index c550a1ccb0..c550a1ccb0 100755..100644
--- a/helpcontent2/source/text/shared/01/06010601.xhp
+++ b/helpcontent2/source/text/shared/01/06010601.xhp
diff --git a/helpcontent2/source/text/shared/01/06050500.xhp b/helpcontent2/source/text/shared/01/06050500.xhp
index 9a7f86c7b1..9a7f86c7b1 100755..100644
--- a/helpcontent2/source/text/shared/01/06050500.xhp
+++ b/helpcontent2/source/text/shared/01/06050500.xhp
diff --git a/helpcontent2/source/text/shared/01/06140101.xhp b/helpcontent2/source/text/shared/01/06140101.xhp
index 152085979a..152085979a 100755..100644
--- a/helpcontent2/source/text/shared/01/06140101.xhp
+++ b/helpcontent2/source/text/shared/01/06140101.xhp
diff --git a/helpcontent2/source/text/shared/01/06140200.xhp b/helpcontent2/source/text/shared/01/06140200.xhp
index b21fbd6283..77c725377f 100644
--- a/helpcontent2/source/text/shared/01/06140200.xhp
+++ b/helpcontent2/source/text/shared/01/06140200.xhp
@@ -100,6 +100,7 @@
 <paragraph role="paragraph" id="par_id3149655" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_SAVE">Saves the current shortcut key configuration, so that you can load it later.</ahelp></paragraph>
 <!-- removed HID sfx2_PushButton_TP_CONFIG_ACCEL_BTN_RESET -->
 <bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_RESET" id="bm_id31593421" localize="false"/>
+<paragraph role="heading" id="hd_id3150824" xml-lang="en-US" level="2" l10n="U" oldref="19">Reset</paragraph>
 <paragraph role="paragraph" id="par_id756248" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Resets modified values back to the default values.</ahelp></paragraph><comment>i48946</comment>
 <section id="relatedtopics">
 <embed href="text/shared/guide/configure_overview.xhp#configure_overview"/>
diff --git a/helpcontent2/source/text/shared/01/06140402.xhp b/helpcontent2/source/text/shared/01/06140402.xhp
index 125e85ebdb..125e85ebdb 100755..100644
--- a/helpcontent2/source/text/shared/01/06140402.xhp
+++ b/helpcontent2/source/text/shared/01/06140402.xhp
diff --git a/helpcontent2/source/text/shared/01/06150100.xhp b/helpcontent2/source/text/shared/01/06150100.xhp
index 44e981115e..44e981115e 100755..100644
--- a/helpcontent2/source/text/shared/01/06150100.xhp
+++ b/helpcontent2/source/text/shared/01/06150100.xhp
diff --git a/helpcontent2/source/text/shared/01/06202000.xhp b/helpcontent2/source/text/shared/01/06202000.xhp
index b58ba0ae2f..b58ba0ae2f 100755..100644
--- a/helpcontent2/source/text/shared/01/06202000.xhp
+++ b/helpcontent2/source/text/shared/01/06202000.xhp
diff --git a/helpcontent2/source/text/shared/01/07080000.xhp b/helpcontent2/source/text/shared/01/07080000.xhp
index da2b488bca..da2b488bca 100755..100644
--- a/helpcontent2/source/text/shared/01/07080000.xhp
+++ b/helpcontent2/source/text/shared/01/07080000.xhp
diff --git a/helpcontent2/source/text/shared/01/08060100.xhp b/helpcontent2/source/text/shared/01/08060100.xhp
deleted file mode 100644
index 302243e49a..0000000000
--- a/helpcontent2/source/text/shared/01/08060100.xhp
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<helpdocument version="1.0">
-	
-<!--
-***********************************************************************
- *
- * 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.
- *
- ************************************************************************
- -->
- 
-	
-<meta>
-      <topic id="textshared0108060100xml" indexer="include">
-         <title xml-lang="en-US" id="tit">Registration</title>
-         <filename>/text/shared/01/08060100.xhp</filename>
-      </topic>
-   </meta>
-   <body>
-      <paragraph xml-lang="en-US" id="par_id3152876" role="paragraph" l10n="E" oldref="1"
-                 localize="false"/>
-      <section id="registrierung">
-<bookmark xml-lang="en-US" branch="index" id="bm_id8190557"><bookmark_value>online registration</bookmark_value>
-         <bookmark_value>registering; %PRODUCTNAME</bookmark_value>
-</bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:OnlineRegistrationDlg" id="bm_id3640231" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:OnlineRegistrationDlg" id="bm_id3147617" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DESKTOP_HID_FIRSTSTART_REGISTRATION" id="bm_id2025818" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3147477" role="heading" level="1" l10n="U" oldref="2"><link href="text/shared/01/08060100.xhp" name="Registration">Registration</link></paragraph>
-         <paragraph xml-lang="en-US" id="par_id3153882" role="paragraph" l10n="U" oldref="3"><ahelp hid=".uno:OnlineRegistrationDlg">Connects to the $[officename] Web site where you can register your copy of $[officename].</ahelp></paragraph>
-      </section>
-      <section id="howtoget">
-         <embed href="text/shared/00/00000408.xhp#online"/>
-      </section>
-      <paragraph xml-lang="en-US" id="hd_id3153624" role="heading" level="2" l10n="U" oldref="4">Registration Dialog</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3150445" role="paragraph" l10n="U" oldref="5">The <emph>Registration</emph> dialog appears after you install $[officename].</paragraph>
-      <paragraph xml-lang="en-US" id="hd_id3145629" role="heading" level="3" l10n="U"
-                 oldref="10">I want to register now</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_NOW" id="bm_id3150902" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/desktop:RadioButton:TP_REGISTRATION:RB_REGISTRATION_NOW" id="bm_id4082461" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id3149999" role="paragraph" l10n="U" oldref="6"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_NOW">Launches your default Web browser and connects to the $[officename] Web site where you can register your copy of $[officename].</ahelp></paragraph>
-      <paragraph xml-lang="en-US" id="hd_id3149760" role="heading" level="3" l10n="U"
-                 oldref="11">I want to register later</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_LATER" id="bm_id3156302" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/desktop:RadioButton:TP_REGISTRATION:RB_REGISTRATION_LATER" id="bm_id5322122" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id3151234" role="paragraph" l10n="U" oldref="7"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_LATER">Hides the <emph>Registration</emph> dialog for the next seven days.</ahelp></paragraph>
-      <paragraph xml-lang="en-US" id="hd_id3147557" role="heading" level="3" l10n="U"
-                 oldref="12">I do not want to register</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_NEVER" id="bm_id3152425" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/desktop:RadioButton:TP_REGISTRATION:RB_REGISTRATION_NEVER" id="bm_id9121677" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id3148548" role="paragraph" l10n="U" oldref="8"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_NEVER">Permanently hides the <emph>Registration</emph> dialog. To register at a later time, choose <emph>Help - Registration</emph>.</ahelp></paragraph>
-   </body>
-</helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/extensionupdate.xhp b/helpcontent2/source/text/shared/01/extensionupdate.xhp
index 4889648988..7c083a0442 100644
--- a/helpcontent2/source/text/shared/01/extensionupdate.xhp
+++ b/helpcontent2/source/text/shared/01/extensionupdate.xhp
@@ -64,9 +64,9 @@
 <paragraph id="par_id3372295" role="paragraph" xml-lang="en-US">If all updates have been processed the Download and Installation dialog shows that it has finished. You can abort the download and installation process by clicking the <emph>Abort Update</emph> button.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/desktop:CheckBox:RID_DLG_UPDATE:RID_DLG_UPDATE_ALL" id="bm_id3114108" localize="false"/>
 <paragraph id="hd_id5699942" role="heading" xml-lang="en-US" level="2">Show all Updates</paragraph>
-<paragraph id="par_id641193" role="paragraph" xml-lang="en-US"><ahelp hid=".">By default, only the down-loadable extensions are shown in the dialog. Mark <emph>Show all Updates</emph> to see also other extensions and error messages.</ahelp></paragraph>
+<paragraph id="par_id641193" role="paragraph" xml-lang="en-US"><ahelp hid=".">By default, only the downloadable extensions are shown in the dialog. Mark <emph>Show all Updates</emph> to see also other extensions and error messages.</ahelp></paragraph>
 <section id="relatedtopics">
 <paragraph id="par_id7634510" role="paragraph" xml-lang="en-US"><link href="text/shared/01/packagemanager.xhp">Extension Manager</link></paragraph>
 </section>
 </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/formatting_mark.xhp b/helpcontent2/source/text/shared/01/formatting_mark.xhp
index 0417dc0c38..0417dc0c38 100755..100644
--- a/helpcontent2/source/text/shared/01/formatting_mark.xhp
+++ b/helpcontent2/source/text/shared/01/formatting_mark.xhp
diff --git a/helpcontent2/source/text/shared/01/gallery_files.xhp b/helpcontent2/source/text/shared/01/gallery_files.xhp
index 0971d97dbe..0971d97dbe 100755..100644
--- a/helpcontent2/source/text/shared/01/gallery_files.xhp
+++ b/helpcontent2/source/text/shared/01/gallery_files.xhp
diff --git a/helpcontent2/source/text/shared/01/grid.xhp b/helpcontent2/source/text/shared/01/grid.xhp
index 4fa1a318f1..4fa1a318f1 100755..100644
--- a/helpcontent2/source/text/shared/01/grid.xhp
+++ b/helpcontent2/source/text/shared/01/grid.xhp
diff --git a/helpcontent2/source/text/shared/01/guides.xhp b/helpcontent2/source/text/shared/01/guides.xhp
index f26ee296c2..bc12c29324 100755..100644
--- a/helpcontent2/source/text/shared/01/guides.xhp
+++ b/helpcontent2/source/text/shared/01/guides.xhp
@@ -35,7 +35,7 @@
 		<helpdocument version="1.0">
 <meta>
 <topic id="textshared01guidesxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Guides</title>
+<title id="tit" xml-lang="en-US">Snap Lines</title>
 <filename>/text/shared/01/guides.xhp</filename>
 </topic>
 </meta>
@@ -43,16 +43,16 @@
 <section id="guides">
 <bookmark xml-lang="en-US" branch="index" id="bm_id1441999"><bookmark_value>guides;display options (Impress/Draw)</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:SnapLinesMenu" id="bm_id2510147" localize="false"/><paragraph role="heading" id="par_idN10562" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/01/guides.xhp">Guides</link></paragraph>
-<paragraph role="paragraph" id="par_id3146313" xml-lang="en-US" l10n="CHG" oldref="7"><ahelp hid=".">Specifies the display options for guides.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:SnapLinesMenu" id="bm_id2510147" localize="false"/><paragraph role="heading" id="par_idN10562" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/01/guides.xhp">Snap Lines</link></paragraph>
+<paragraph role="paragraph" id="par_id3146313" xml-lang="en-US" l10n="CHG" oldref="7"><ahelp hid=".">Specifies the display options for snap lines.</ahelp></paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/shared/00/00000403.xhp#guides"/>
 </section>
-<paragraph role="heading" id="par_idN1057B" xml-lang="en-US" level="2" l10n="NEW">Display Guides</paragraph>
-<paragraph role="paragraph" id="par_idN1057F" xml-lang="en-US" l10n="NEW">Displays or hides guides that you can use to align objects on a page.</paragraph>
-<paragraph role="heading" id="par_idN10582" xml-lang="en-US" level="2" l10n="NEW">Snap to Guides</paragraph>
-<comment>changed in BetterDefaults_Gridhandling issue 112000</comment><paragraph role="paragraph" id="par_idN10586" xml-lang="en-US" l10n="CHG">Automatically aligns objects to vertical and horizontal guides. To override this feature, hold down the <switchinline select="sys"><caseinline select="MAC">Option key</caseinline><defaultinline>Alt key </defaultinline></switchinline>when you drag an object.<comment>UFI: test it! copied from shared\01\grid.xhp</comment></paragraph><comment>UFI: removed double help id</comment><paragraph role="heading" id="par_idN105C6" xml-lang="en-US" level="2" l10n="NEW">Guides to Front</paragraph>
-<paragraph role="paragraph" id="par_idN105CA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays the guides in front of the objects on the slide or page.</ahelp></paragraph>
+<paragraph role="heading" id="par_idN1057B" xml-lang="en-US" level="2" l10n="NEW">Display Snap Lines</paragraph>
+<paragraph role="paragraph" id="par_idN1057F" xml-lang="en-US" l10n="NEW">Displays or hides snap lines that you can use to align objects on a page.</paragraph>
+<paragraph role="heading" id="par_idN10582" xml-lang="en-US" level="2" l10n="NEW">Snap to Snap Lines</paragraph>
+<comment>changed in BetterDefaults_Gridhandling issue 112000</comment><paragraph role="paragraph" id="par_idN10586" xml-lang="en-US" l10n="CHG">Automatically aligns objects to vertical and horizontal snap lines. To override this feature, hold down the <switchinline select="sys"><caseinline select="MAC">Option key</caseinline><defaultinline>Alt key </defaultinline></switchinline>when you drag an object.<comment>UFI: test it! copied from shared\01\grid.xhp</comment></paragraph><comment>UFI: removed double help id</comment><paragraph role="heading" id="par_idN105C6" xml-lang="en-US" level="2" l10n="NEW">Snap Lines to Front</paragraph>
+<paragraph role="paragraph" id="par_idN105CA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays the snap lines in front of the objects on the slide or page.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/makefile.mk b/helpcontent2/source/text/shared/01/makefile.mk
index e3ba6734c9..f630d02d3a 100644
--- a/helpcontent2/source/text/shared/01/makefile.mk
+++ b/helpcontent2/source/text/shared/01/makefile.mk
@@ -132,7 +132,6 @@ XHPFILES = \
    04060100.xhp \
    04060200.xhp \
    04100000.xhp \
-   04110000.xhp \
    04140000.xhp \
    04150000.xhp \
    04150100.xhp \
@@ -311,7 +310,6 @@ XHPFILES = \
    06990000.xhp \
    07010000.xhp \
    07080000.xhp \
-   08060100.xhp \
    about_meta_tags.xhp \
    digitalsignatures.xhp \
    extensionupdate.xhp \
@@ -322,8 +320,6 @@ XHPFILES = \
    guides.xhp \
    mediaplayer.xhp \
    moviesound.xhp \
-   online_update.xhp \
-   online_update_dialog.xhp \
    packagemanager.xhp \
    password_dlg.xhp \
    password_main.xhp \
@@ -338,7 +334,7 @@ XHPFILES = \
    xformsdatachange.xhp \
    xformsdataname.xhp \
    xformsdatatab.xhp 
-    
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/helpcontent2/source/text/shared/01/packagemanager.xhp b/helpcontent2/source/text/shared/01/packagemanager.xhp
index e3db16ed62..e3db16ed62 100755..100644
--- a/helpcontent2/source/text/shared/01/packagemanager.xhp
+++ b/helpcontent2/source/text/shared/01/packagemanager.xhp
diff --git a/helpcontent2/source/text/shared/01/password_main.xhp b/helpcontent2/source/text/shared/01/password_main.xhp
index 65e535d0a4..65e535d0a4 100755..100644
--- a/helpcontent2/source/text/shared/01/password_main.xhp
+++ b/helpcontent2/source/text/shared/01/password_main.xhp
diff --git a/helpcontent2/source/text/shared/02/01140000.xhp b/helpcontent2/source/text/shared/02/01140000.xhp
index 2ef4d01612..2c8124afeb 100644
--- a/helpcontent2/source/text/shared/02/01140000.xhp
+++ b/helpcontent2/source/text/shared/02/01140000.xhp
@@ -10,9 +10,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -73,7 +70,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3154288" role="paragraph" l10n="E">
-<image id="img_id3153683" src="res/commandimagelist/sc_insertdraw.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153683">Icon</alt>
+<image id="img_id3153683" src="cmd/sc_insertdraw.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153683">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -91,7 +88,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3147573" role="paragraph" l10n="E">
-<image id="img_id3153824" src="res/commandimagelist/sc_drawselect.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3153824">Icon</alt>
+<image id="img_id3153824" src="cmd/sc_drawselect.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3153824">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
@@ -108,7 +105,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3154897" role="paragraph" l10n="E">
-<image id="img_id3147618" src="res/commandimagelist/sc_line.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3147618">Icon</alt>
+<image id="img_id3147618" src="cmd/sc_line.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3147618">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
@@ -126,7 +123,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3154125" role="paragraph" l10n="E">
-<image id="img_id3158407" src="res/commandimagelist/sc_rect.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3158407">Icon</alt>
+<image id="img_id3158407" src="cmd/sc_rect.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3158407">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
@@ -143,7 +140,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3156443" role="paragraph" l10n="E">
-<image id="img_id3153951" src="res/commandimagelist/sc_ellipse.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153951">Icon</alt>
+<image id="img_id3153951" src="cmd/sc_ellipse.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153951">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
@@ -161,7 +158,7 @@
             <tablerow>
                <tablecell>
                   <paragraph xml-lang="en-US" id="par_id3154129" role="paragraph" l10n="E">
-<image id="img_id3152576" src="res/commandimagelist/sc_polygon_unfilled.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3152576">Icon</alt>
+<image id="img_id3152576" src="cmd/sc_polygon_unfilled.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3152576">Icon</alt>
 	</image></paragraph>
                </tablecell>
                <tablecell>
@@ -183,7 +180,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3153876" role="paragraph" l10n="E">
-<image id="img_id3149379" src="res/commandimagelist/sc_bezier_unfilled.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3149379">Icon</alt>
+<image id="img_id3149379" src="cmd/sc_bezier_unfilled.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3149379">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
@@ -201,7 +198,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3155602" role="paragraph" l10n="E">
-<image id="img_id3154510" src="res/commandimagelist/sc_linetoolbox.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3154510">Icon</alt>
+<image id="img_id3154510" src="cmd/sc_linetoolbox.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3154510">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
@@ -219,7 +216,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3156359" role="paragraph" l10n="E">
-<image id="img_id3153710" src="res/commandimagelist/sc_arc.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153710">Icon</alt>
+<image id="img_id3153710" src="cmd/sc_arc.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153710">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
@@ -236,7 +233,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3154363" role="paragraph" l10n="E">
-<image id="img_id3159186" src="res/commandimagelist/sc_pie.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3159186">Icon</alt>
+<image id="img_id3159186" src="cmd/sc_pie.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3159186">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
@@ -253,7 +250,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3151017" role="paragraph" l10n="E">
-<image id="img_id3147315" src="res/commandimagelist/sc_circlecut.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3147315">Icon</alt>
+<image id="img_id3147315" src="cmd/sc_circlecut.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3147315">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
@@ -270,7 +267,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3145790" role="paragraph" l10n="E">
-<image id="img_id3155608" src="res/commandimagelist/sc_texttoolbox.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155608">Icon</alt>
+<image id="img_id3155608" src="cmd/sc_texttoolbox.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155608">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
@@ -287,7 +284,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3150380" role="paragraph" l10n="E">
-<image id="img_id3152580" src="res/commandimagelist/sc_text_marquee.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3152580">Icon</alt>
+<image id="img_id3152580" src="cmd/sc_text_marquee.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3152580">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
@@ -305,7 +302,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3153781" role="paragraph" l10n="E">
-<image id="img_id3145256" src="res/commandimagelist/sc_drawcaption.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3145256">Icon</alt>
+<image id="img_id3145256" src="cmd/sc_drawcaption.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3145256">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
@@ -344,7 +341,7 @@
             <tablerow>
                <tablecell>
                   <paragraph xml-lang="en-US" id="par_id3156068" role="paragraph" l10n="E">
-<image id="img_id3154818" src="res/commandimagelist/sc_verticalcaption.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3154818">Icon</alt>
+<image id="img_id3154818" src="cmd/sc_verticalcaption.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3154818">Icon</alt>
 	</image></paragraph>
                </tablecell>
                <tablecell>
@@ -363,7 +360,7 @@
             <tablerow>
                <tablecell>
                   <paragraph xml-lang="en-US" id="par_id3146929" role="paragraph" l10n="E">
-<image id="img_id3154372" src="res/commandimagelist/sc_verticaltext.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3154372">Icon</alt>
+<image id="img_id3154372" src="cmd/sc_verticaltext.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3154372">Icon</alt>
 	</image></paragraph>
                </tablecell>
                <tablecell>
diff --git a/helpcontent2/source/text/shared/02/01170000.xhp b/helpcontent2/source/text/shared/02/01170000.xhp
index a11fd21111..2a97193bf6 100644
--- a/helpcontent2/source/text/shared/02/01170000.xhp
+++ b/helpcontent2/source/text/shared/02/01170000.xhp
@@ -72,7 +72,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3155341" xml-lang="en-US" l10n="E">
-<image id="img_id3150943" src="res/commandimagelist/sc_config.png" width="0.1665in" height="0.1665in"><alt id="alt_id3150943" xml-lang="en-US">Icon</alt></image></paragraph>
+<image id="img_id3150943" src="cmd/sc_config.png" width="0.1665in" height="0.1665in"><alt id="alt_id3150943" xml-lang="en-US">Icon</alt></image></paragraph>
 </tablecell>
 <tablecell>
 <paragraph role="paragraph" id="par_id3149670" xml-lang="en-US" l10n="CHG" oldref="3">Form Controls</paragraph>
@@ -115,7 +115,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3156106" xml-lang="en-US" l10n="E">
-<image id="img_id3153516" src="res/commandimagelist/sc_drawselect.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153516" xml-lang="en-US">Icon</alt></image></paragraph>
+<image id="img_id3153516" src="cmd/sc_drawselect.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153516" xml-lang="en-US">Icon</alt></image></paragraph>
 </tablecell>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150470" xml-lang="en-US" l10n="U" oldref="25">This icon switches the mouse pointer to the select mode, or deactivates this mode. The select mode is used to select the controls of the current form.</paragraph>
@@ -137,7 +137,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3148483" xml-lang="en-US" l10n="E">
-<image id="img_id3156380" src="res/commandimagelist/sc_checkbox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3156380" xml-lang="en-US">Icon</alt></image></paragraph>
+<image id="img_id3156380" src="cmd/sc_checkbox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3156380" xml-lang="en-US">Icon</alt></image></paragraph>
 </tablecell>
 <tablecell>
 <paragraph role="paragraph" id="par_id3153927" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid=".uno:CheckBox">Creates a check box.</ahelp> Check boxes allow you to activate or deactivate a function in a form.</paragraph>
@@ -153,7 +153,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3163665" xml-lang="en-US" l10n="E">
-<image id="img_id3153266" src="res/commandimagelist/sc_edit.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153266" xml-lang="en-US">Icon</alt></image></paragraph>
+<image id="img_id3153266" src="cmd/sc_edit.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153266" xml-lang="en-US">Icon</alt></image></paragraph>
 </tablecell>
 <tablecell>
 <paragraph role="paragraph" id="par_id3158444" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid=".uno:Edit">Creates a text box.</ahelp> Text boxes are fields in which the user can enter text. In a form, text boxes display data or allow for new data input.</paragraph>
@@ -169,7 +169,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3154836" xml-lang="en-US" l10n="E">
-<image id="img_id3143277" src="res/commandimagelist/sc_formattedfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3143277" xml-lang="en-US">Icon</alt>
+<image id="img_id3143277" src="cmd/sc_formattedfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3143277" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -188,7 +188,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3145801" xml-lang="en-US" l10n="E">
-<image id="img_id3151073" src="res/commandimagelist/sc_insertpushbutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id3151073" xml-lang="en-US">Icon</alt>
+<image id="img_id3151073" src="cmd/sc_insertpushbutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id3151073" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -207,7 +207,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3152971" xml-lang="en-US" l10n="E">
-<image id="img_id3152999" src="res/commandimagelist/sc_radiobutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152999" xml-lang="en-US">Icon</alt>
+<image id="img_id3152999" src="cmd/sc_radiobutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152999" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -226,7 +226,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3154326" xml-lang="en-US" l10n="E">
-<image id="img_id3154135" src="res/commandimagelist/sc_listbox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154135" xml-lang="en-US">Icon</alt>
+<image id="img_id3154135" src="cmd/sc_listbox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154135" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -244,7 +244,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3149981" xml-lang="en-US" l10n="E">
-<image id="img_id3148817" src="res/commandimagelist/sc_combobox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148817" xml-lang="en-US">Icon</alt>
+<image id="img_id3148817" src="cmd/sc_combobox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148817" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -262,7 +262,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3145295" xml-lang="en-US" l10n="E">
-<image id="img_id3151017" src="res/commandimagelist/sc_insertfixedtext.png" width="0.2228in" height="0.2228in"><alt id="alt_id3151017" xml-lang="en-US">Icon</alt>
+<image id="img_id3151017" src="cmd/sc_insertfixedtext.png" width="0.2228in" height="0.2228in"><alt id="alt_id3151017" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -286,7 +286,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_idN11B65" xml-lang="en-US" l10n="NEW">
-<image id="img_id6128727" src="res/commandimagelist/sc_usewizards.png" width="0.2228in" height="0.2228in"><alt id="alt_id6128727" xml-lang="en-US">Icon</alt>
+<image id="img_id6128727" src="cmd/sc_usewizards.png" width="0.2228in" height="0.2228in"><alt id="alt_id6128727" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -309,7 +309,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_idN11A64" xml-lang="en-US" l10n="NEW">
-<image id="img_id7816400" src="res/commandimagelist/sc_spinbutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id7816400" xml-lang="en-US">Icon</alt>
+<image id="img_id7816400" src="cmd/sc_spinbutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id7816400" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -328,7 +328,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_idN11ACA" xml-lang="en-US" l10n="NEW">
-<image id="img_id8203985" src="res/commandimagelist/sc_scrollbar.png" width="0.2228in" height="0.2228in"><alt id="alt_id8203985" xml-lang="en-US">Icon</alt>
+<image id="img_id8203985" src="cmd/sc_scrollbar.png" width="0.2228in" height="0.2228in"><alt id="alt_id8203985" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -432,7 +432,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3159622" xml-lang="en-US" l10n="E">
-<image id="img_id3154378" src="res/commandimagelist/sc_imagebutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154378" xml-lang="en-US">Icon</alt>
+<image id="img_id3154378" src="cmd/sc_imagebutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154378" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -450,7 +450,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3155869" xml-lang="en-US" l10n="E">
-<image id="img_id3152381" src="res/commandimagelist/sc_objectcatalog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152381" xml-lang="en-US">Icon</alt>
+<image id="img_id3152381" src="cmd/sc_objectcatalog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152381" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -469,7 +469,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3149423" xml-lang="en-US" l10n="E">
-<image id="img_id3150096" src="res/commandimagelist/sc_adddatefield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150096" xml-lang="en-US">Icon</alt>
+<image id="img_id3150096" src="cmd/sc_adddatefield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150096" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -490,7 +490,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3153687" xml-lang="en-US" l10n="E">
-<image id="img_id3155949" src="res/commandimagelist/sc_timefield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155949" xml-lang="en-US">Icon</alt>
+<image id="img_id3155949" src="cmd/sc_timefield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155949" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -509,7 +509,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150531" xml-lang="en-US" l10n="E">
-<image id="img_id3154344" src="res/commandimagelist/sc_filecontrol.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154344" xml-lang="en-US">Icon</alt>
+<image id="img_id3154344" src="cmd/sc_filecontrol.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154344" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -527,7 +527,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3149396" xml-lang="en-US" l10n="E">
-<image id="img_id3153012" src="res/commandimagelist/sc_insertnumericfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153012" xml-lang="en-US">Icon</alt>
+<image id="img_id3153012" src="cmd/sc_insertnumericfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153012" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -545,7 +545,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3145324" xml-lang="en-US" l10n="E">
-<image id="img_id3152866" src="res/commandimagelist/sc_currencyfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152866" xml-lang="en-US">Icon</alt>
+<image id="img_id3152866" src="cmd/sc_currencyfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152866" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -563,7 +563,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3149742" xml-lang="en-US" l10n="E">
-<image id="img_id3148924" src="res/commandimagelist/sc_insertpatternfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148924" xml-lang="en-US">Icon</alt>
+<image id="img_id3148924" src="cmd/sc_insertpatternfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148924" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -582,7 +582,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3159334" xml-lang="en-US" l10n="E">
-<image id="img_id3153790" src="res/commandimagelist/sc_groupbox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153790" xml-lang="en-US">Icon</alt>
+<image id="img_id3153790" src="cmd/sc_groupbox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153790" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -605,7 +605,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3156402" xml-lang="en-US" l10n="E">
-<image id="img_id3146324" src="res/commandimagelist/sc_grid.png" width="0.2228in" height="0.2228in"><alt id="alt_id3146324" xml-lang="en-US">Icon</alt>
+<image id="img_id3146324" src="cmd/sc_grid.png" width="0.2228in" height="0.2228in"><alt id="alt_id3146324" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -624,7 +624,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_idN11B2C" xml-lang="en-US" l10n="NEW">
-<image id="img_id5074922" src="res/commandimagelist/sc_navigationbar.png" width="0.2228in" height="0.2228in"><alt id="alt_id5074922" xml-lang="en-US">Icon</alt>
+<image id="img_id5074922" src="cmd/sc_navigationbar.png" width="0.2228in" height="0.2228in"><alt id="alt_id5074922" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -648,7 +648,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150261" xml-lang="en-US" l10n="E">
-<image id="img_id3149351" src="res/commandimagelist/sc_autocontrolfocus.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149351" xml-lang="en-US">Icon</alt>
+<image id="img_id3149351" src="cmd/sc_autocontrolfocus.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149351" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/shared/02/01170002.xhp b/helpcontent2/source/text/shared/02/01170002.xhp
index 7d9c59156a..7d9c59156a 100755..100644
--- a/helpcontent2/source/text/shared/02/01170002.xhp
+++ b/helpcontent2/source/text/shared/02/01170002.xhp
diff --git a/helpcontent2/source/text/shared/02/01170202.xhp b/helpcontent2/source/text/shared/02/01170202.xhp
index f17d5486c1..746a76325c 100644
--- a/helpcontent2/source/text/shared/02/01170202.xhp
+++ b/helpcontent2/source/text/shared/02/01170202.xhp
@@ -174,9 +174,9 @@
          <paragraph xml-lang="en-US" id="par_id3149581" role="paragraph" l10n="U" oldref="64">Here :name is a parameter that must be filled out when loading. The parameter is automatically filled out from the parent form if possible. If the parameter cannot be filled out, this event is called and a linked macro can fill out the parameter.</paragraph>
       </section>
       <section id="Section1">
-<bookmark xml-lang="en-US" branch="hid/EXTENSIONS_HID_EVT_ERROROCCURED" id="bm_id3148387" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/EXTENSIONS_HID_EVT_ERROROCCURRED" id="bm_id3148387" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3146926" role="heading" level="2" l10n="U" oldref="9">Error occurred</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3149485" role="paragraph" l10n="U" oldref="10"><ahelp hid="HID_EVT_ERROROCCURED">The<emph> Error occurred </emph>event is activated if an error occurs when accessing the data source.</ahelp> This applies to forms, list boxes and combo boxes.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149485" role="paragraph" l10n="U" oldref="10"><ahelp hid="HID_EVT_ERROROCCURRED">The<emph> Error occurred </emph>event is activated if an error occurs when accessing the data source.</ahelp> This applies to forms, list boxes and combo boxes.</paragraph>
       </section>
 </sort>
 </body>
diff --git a/helpcontent2/source/text/shared/02/01170700.xhp b/helpcontent2/source/text/shared/02/01170700.xhp
index f97e6538c8..f97e6538c8 100755..100644
--- a/helpcontent2/source/text/shared/02/01170700.xhp
+++ b/helpcontent2/source/text/shared/02/01170700.xhp
diff --git a/helpcontent2/source/text/shared/02/01170801.xhp b/helpcontent2/source/text/shared/02/01170801.xhp
index 3c1b9f082c..3c1b9f082c 100755..100644
--- a/helpcontent2/source/text/shared/02/01170801.xhp
+++ b/helpcontent2/source/text/shared/02/01170801.xhp
diff --git a/helpcontent2/source/text/shared/02/01170802.xhp b/helpcontent2/source/text/shared/02/01170802.xhp
index 9caade7109..9caade7109 100755..100644
--- a/helpcontent2/source/text/shared/02/01170802.xhp
+++ b/helpcontent2/source/text/shared/02/01170802.xhp
diff --git a/helpcontent2/source/text/shared/02/01170901.xhp b/helpcontent2/source/text/shared/02/01170901.xhp
index 1197f128d7..1197f128d7 100755..100644
--- a/helpcontent2/source/text/shared/02/01170901.xhp
+++ b/helpcontent2/source/text/shared/02/01170901.xhp
diff --git a/helpcontent2/source/text/shared/02/01170902.xhp b/helpcontent2/source/text/shared/02/01170902.xhp
index fcad12f334..fcad12f334 100755..100644
--- a/helpcontent2/source/text/shared/02/01170902.xhp
+++ b/helpcontent2/source/text/shared/02/01170902.xhp
diff --git a/helpcontent2/source/text/shared/02/01170903.xhp b/helpcontent2/source/text/shared/02/01170903.xhp
index b6a361e4e1..b6a361e4e1 100755..100644
--- a/helpcontent2/source/text/shared/02/01170903.xhp
+++ b/helpcontent2/source/text/shared/02/01170903.xhp
diff --git a/helpcontent2/source/text/shared/02/01170904.xhp b/helpcontent2/source/text/shared/02/01170904.xhp
index 1912461274..1912461274 100755..100644
--- a/helpcontent2/source/text/shared/02/01170904.xhp
+++ b/helpcontent2/source/text/shared/02/01170904.xhp
diff --git a/helpcontent2/source/text/shared/02/01171200.xhp b/helpcontent2/source/text/shared/02/01171200.xhp
index 65aeeaf7bc..d43cf9ce96 100644
--- a/helpcontent2/source/text/shared/02/01171200.xhp
+++ b/helpcontent2/source/text/shared/02/01171200.xhp
@@ -57,7 +57,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153750" xml-lang="en-US" l10n="E">
-<image id="img_id3153049" src="res/commandimagelist/sc_gridvisible.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3153049" xml-lang="en-US">Icon</alt>
+<image id="img_id3153049" src="cmd/sc_gridvisible.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3153049" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/01171300.xhp b/helpcontent2/source/text/shared/02/01171300.xhp
index bc7bdf2474..8172fd217b 100644
--- a/helpcontent2/source/text/shared/02/01171300.xhp
+++ b/helpcontent2/source/text/shared/02/01171300.xhp
@@ -43,7 +43,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3156027" xml-lang="en-US" l10n="E">
-<image id="img_id3157896" src="res/commandimagelist/sc_griduse.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3157896" xml-lang="en-US">Icon</alt>
+<image id="img_id3157896" src="cmd/sc_griduse.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3157896" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/01171400.xhp b/helpcontent2/source/text/shared/02/01171400.xhp
index 032ee0e427..63234c21e0 100644
--- a/helpcontent2/source/text/shared/02/01171400.xhp
+++ b/helpcontent2/source/text/shared/02/01171400.xhp
@@ -33,7 +33,7 @@
 <helpdocument version="1.0">
 <meta>
 <topic id="textshared0201171400xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Guides When Moving</title>
+<title id="tit" xml-lang="en-US">Helplines While Moving</title>
 <filename>/text/shared/02/01171400.xhp</filename>
 </topic>
 <history>
@@ -42,7 +42,7 @@
 </history>
 </meta>
 <body><comment>UFI: removed help ids</comment>
-<paragraph role="heading" id="hd_id3155599" xml-lang="en-US" level="1" l10n="U" oldref="1">Guides When Moving</paragraph>
+<paragraph role="heading" id="hd_id3155599" xml-lang="en-US" level="1" l10n="U" oldref="1">Helplines While Moving</paragraph>
 <embed href="text/shared/optionen/01070100.xhp#verschieb"/>
 <embed href="text/shared/optionen/01070100.xhp#vertext"/>
 <section id="syhline">
@@ -50,11 +50,11 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149549" xml-lang="en-US" l10n="E">
-<image id="img_id3149760" src="res/commandimagelist/sc_helplinesmove.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3149760" xml-lang="en-US">Icon</alt>
+<image id="img_id3149760" src="cmd/sc_helplinesmove.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3149760" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153049" xml-lang="en-US" l10n="U" oldref="4">Guides When Moving</paragraph>
+<paragraph role="paragraph" id="par_id3153049" xml-lang="en-US" l10n="U" oldref="4">Helplines While Moving</paragraph>
 </tablecell>
 </tablerow>
 </table>
diff --git a/helpcontent2/source/text/shared/02/01220000.xhp b/helpcontent2/source/text/shared/02/01220000.xhp
index 8c348eb77c..8f28979e08 100644
--- a/helpcontent2/source/text/shared/02/01220000.xhp
+++ b/helpcontent2/source/text/shared/02/01220000.xhp
@@ -52,7 +52,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3153345" xml-lang="en-US" l10n="E">
-<image id="img_id3149095" src="res/commandimagelist/sc_navigator.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149095" xml-lang="en-US">Icon</alt>
+<image id="img_id3149095" src="cmd/sc_navigator.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149095" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/shared/02/01230000.xhp b/helpcontent2/source/text/shared/02/01230000.xhp
index 8cfafc1f2c..1ee5e20340 100644
--- a/helpcontent2/source/text/shared/02/01230000.xhp
+++ b/helpcontent2/source/text/shared/02/01230000.xhp
@@ -56,7 +56,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3143267" xml-lang="en-US" l10n="E">
-<image id="img_id3149999" src="res/commandimagelist/sc_designerdialog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149999" xml-lang="en-US">Icon</alt>
+<image id="img_id3149999" src="cmd/sc_designerdialog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149999" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/02040000.xhp b/helpcontent2/source/text/shared/02/02040000.xhp
index 94531b38d1..c38e665656 100644
--- a/helpcontent2/source/text/shared/02/02040000.xhp
+++ b/helpcontent2/source/text/shared/02/02040000.xhp
@@ -52,7 +52,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3147291" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_textdirectionlefttoright.png" id="img_id3155805"><alt xml-lang="en-US" id="alt_id3155805">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3147291" xml-lang="en-US" oldref=""><image src="cmd/sc_textdirectionlefttoright.png" id="img_id3155805"><alt xml-lang="en-US" id="alt_id3155805">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3153749" l10n="U" xml-lang="en-US" oldref="3">Text direction from left to right</paragraph>
diff --git a/helpcontent2/source/text/shared/02/02050000.xhp b/helpcontent2/source/text/shared/02/02050000.xhp
index 0922ba4fa5..650d810eb8 100644
--- a/helpcontent2/source/text/shared/02/02050000.xhp
+++ b/helpcontent2/source/text/shared/02/02050000.xhp
@@ -52,7 +52,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3154186" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_textdirectiontoptobottom.png" id="img_id3154927"><alt xml-lang="en-US" id="alt_id3154927">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3154186" xml-lang="en-US" oldref=""><image src="cmd/sc_textdirectiontoptobottom.png" id="img_id3154927"><alt xml-lang="en-US" id="alt_id3154927">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3149827" l10n="U" xml-lang="en-US" oldref="3">Text direction from top to bottom</paragraph>
diff --git a/helpcontent2/source/text/shared/02/02130000.xhp b/helpcontent2/source/text/shared/02/02130000.xhp
index 08b571804c..12743eb91d 100644
--- a/helpcontent2/source/text/shared/02/02130000.xhp
+++ b/helpcontent2/source/text/shared/02/02130000.xhp
@@ -53,7 +53,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="E">
-<image id="img_id3150506" src="res/commandimagelist/sc_decrementindent.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150506" xml-lang="en-US">Icon</alt></image></paragraph>
+<image id="img_id3150506" src="cmd/sc_decrementindent.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150506" xml-lang="en-US">Icon</alt></image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155942" xml-lang="en-US" l10n="U" oldref="4">Decrease Indent</paragraph>
diff --git a/helpcontent2/source/text/shared/02/02140000.xhp b/helpcontent2/source/text/shared/02/02140000.xhp
index aa65420e15..f37f7ab43a 100644
--- a/helpcontent2/source/text/shared/02/02140000.xhp
+++ b/helpcontent2/source/text/shared/02/02140000.xhp
@@ -53,7 +53,7 @@
             <tablerow>
                <tablecell>
                   <paragraph xml-lang="en-US" id="par_id3147576" role="paragraph" l10n="E">
-<image id="img_id3149388" src="res/commandimagelist/sc_incrementindent.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3149388">Icon</alt></image></paragraph>
+<image id="img_id3149388" src="cmd/sc_incrementindent.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3149388">Icon</alt></image></paragraph>
                </tablecell>
                <tablecell>
                   <paragraph xml-lang="en-US" id="par_id3166460" role="paragraph" l10n="U" oldref="4">Increase Indent</paragraph>
diff --git a/helpcontent2/source/text/shared/02/02160000.xhp b/helpcontent2/source/text/shared/02/02160000.xhp
index 4b71c5a19f..8787b3ff63 100644
--- a/helpcontent2/source/text/shared/02/02160000.xhp
+++ b/helpcontent2/source/text/shared/02/02160000.xhp
@@ -52,7 +52,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3152551" xml-lang="en-US" l10n="E">
-<image id="img_id3149177" src="res/commandimagelist/sc_backcolor.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149177" xml-lang="en-US">Icon</alt>
+<image id="img_id3149177" src="cmd/sc_backcolor.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149177" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/02170000.xhp b/helpcontent2/source/text/shared/02/02170000.xhp
index 50d05ba2b0..8233446307 100644
--- a/helpcontent2/source/text/shared/02/02170000.xhp
+++ b/helpcontent2/source/text/shared/02/02170000.xhp
@@ -48,7 +48,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3147276" xml-lang="en-US" l10n="E">
-<image id="img_id3148538" src="res/commandimagelist/sc_backgroundcolor.png"  ><alt id="alt_id3148538" xml-lang="en-US">Icon</alt>
+<image id="img_id3148538" src="cmd/sc_backgroundcolor.png"  ><alt id="alt_id3148538" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/03110000.xhp b/helpcontent2/source/text/shared/02/03110000.xhp
index 657f9c1417..ccfe1eadb1 100644
--- a/helpcontent2/source/text/shared/02/03110000.xhp
+++ b/helpcontent2/source/text/shared/02/03110000.xhp
@@ -51,7 +51,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150178" xml-lang="en-US" l10n="E">
-<image id="img_id3152425" src="res/commandimagelist/sc_paraspaceincrease.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152425" xml-lang="en-US">Icon</alt>
+<image id="img_id3152425" src="cmd/sc_paraspaceincrease.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152425" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/03120000.xhp b/helpcontent2/source/text/shared/02/03120000.xhp
index 91da189335..07609d4d7e 100644
--- a/helpcontent2/source/text/shared/02/03120000.xhp
+++ b/helpcontent2/source/text/shared/02/03120000.xhp
@@ -51,7 +51,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155555" xml-lang="en-US" l10n="E">
-<image id="img_id3147834" src="res/commandimagelist/sc_paraspacedecrease.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147834" xml-lang="en-US">Icon</alt>
+<image id="img_id3147834" src="cmd/sc_paraspacedecrease.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147834" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/03130000.xhp b/helpcontent2/source/text/shared/02/03130000.xhp
index dc4f60891b..7471edd829 100644
--- a/helpcontent2/source/text/shared/02/03130000.xhp
+++ b/helpcontent2/source/text/shared/02/03130000.xhp
@@ -57,7 +57,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3147576" xml-lang="en-US" l10n="E">
-<image id="img_id3149095" src="res/commandimagelist/sc_setborderstyle.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149095" xml-lang="en-US">Icon</alt>
+<image id="img_id3149095" src="cmd/sc_setborderstyle.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149095" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/03140000.xhp b/helpcontent2/source/text/shared/02/03140000.xhp
index b90f76ebe0..85eaa1ca68 100644
--- a/helpcontent2/source/text/shared/02/03140000.xhp
+++ b/helpcontent2/source/text/shared/02/03140000.xhp
@@ -48,7 +48,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153377" xml-lang="en-US" l10n="E">
-<image id="img_id3147102" src="res/commandimagelist/sc_linestyle.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147102" xml-lang="en-US">Icon</alt>
+<image id="img_id3147102" src="cmd/sc_linestyle.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147102" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/03150000.xhp b/helpcontent2/source/text/shared/02/03150000.xhp
index 01b4524c38..b73e2df50d 100644
--- a/helpcontent2/source/text/shared/02/03150000.xhp
+++ b/helpcontent2/source/text/shared/02/03150000.xhp
@@ -46,7 +46,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153750" xml-lang="en-US" l10n="E">
-<image id="img_id3147291" src="res/commandimagelist/sc_framelinecolor.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147291" xml-lang="en-US">Icon</alt>
+<image id="img_id3147291" src="cmd/sc_framelinecolor.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147291" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/04210000.xhp b/helpcontent2/source/text/shared/02/04210000.xhp
index 799aee59b8..b43a464e7f 100644
--- a/helpcontent2/source/text/shared/02/04210000.xhp
+++ b/helpcontent2/source/text/shared/02/04210000.xhp
@@ -49,7 +49,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3155899" xml-lang="en-US" l10n="E">
-<image id="img_id3149684" src="res/commandimagelist/sc_optimizetable.png" width="0.423cm" height="0.423cm"><alt id="alt_id3149684" xml-lang="en-US">Icon</alt>
+<image id="img_id3149684" src="cmd/sc_optimizetable.png" width="0.423cm" height="0.423cm"><alt id="alt_id3149684" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/shared/02/05020000.xhp b/helpcontent2/source/text/shared/02/05020000.xhp
index 1665ba369b..72cbd79888 100644
--- a/helpcontent2/source/text/shared/02/05020000.xhp
+++ b/helpcontent2/source/text/shared/02/05020000.xhp
@@ -52,7 +52,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3148548" xml-lang="en-US" l10n="E">
-<image id="img_id3145090" src="res/commandimagelist/sc_lineendstyle.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145090" xml-lang="en-US">Icon</alt>
+<image id="img_id3145090" src="cmd/sc_lineendstyle.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145090" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/05090000.xhp b/helpcontent2/source/text/shared/02/05090000.xhp
index 30ae5fc221..5b4faf2e88 100644
--- a/helpcontent2/source/text/shared/02/05090000.xhp
+++ b/helpcontent2/source/text/shared/02/05090000.xhp
@@ -54,7 +54,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3152551" xml-lang="en-US" l10n="E">
-<image id="img_id3154317" src="res/commandimagelist/sc_toggleobjectrotatemode.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3154317" xml-lang="en-US">Icon</alt>
+<image id="img_id3154317" src="cmd/sc_toggleobjectrotatemode.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3154317" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/05110000.xhp b/helpcontent2/source/text/shared/02/05110000.xhp
index f0d7eca8b7..2f012faf27 100644
--- a/helpcontent2/source/text/shared/02/05110000.xhp
+++ b/helpcontent2/source/text/shared/02/05110000.xhp
@@ -52,7 +52,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="E">
-<image id="img_id3153577" src="res/commandimagelist/sc_objectalign.png" width="0.2228inch" height="0.2228inch"><alt id="alt_id3153577" xml-lang="en-US">Icon</alt>
+<image id="img_id3153577" src="cmd/sc_objectalign.png" width="0.2228inch" height="0.2228inch"><alt id="alt_id3153577" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/06050000.xhp b/helpcontent2/source/text/shared/02/06050000.xhp
index 05b9383a40..fbdabd16e6 100644
--- a/helpcontent2/source/text/shared/02/06050000.xhp
+++ b/helpcontent2/source/text/shared/02/06050000.xhp
@@ -59,7 +59,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3146957" xml-lang="en-US" l10n="E">
-<image id="img_id3143267" src="res/commandimagelist/sc_outlineright.png" width="0.222inch" height="0.222inch"><alt id="alt_id3143267" xml-lang="en-US">Icon</alt>
+<image id="img_id3143267" src="cmd/sc_outlineright.png" width="0.222inch" height="0.222inch"><alt id="alt_id3143267" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/06060000.xhp b/helpcontent2/source/text/shared/02/06060000.xhp
index 26e9deee1c..8ce88c4e19 100644
--- a/helpcontent2/source/text/shared/02/06060000.xhp
+++ b/helpcontent2/source/text/shared/02/06060000.xhp
@@ -59,7 +59,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149388" xml-lang="en-US" l10n="E">
-<image id="img_id3155535" src="res/commandimagelist/sc_outlineleft.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155535" xml-lang="en-US">Icon</alt>
+<image id="img_id3155535" src="cmd/sc_outlineleft.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155535" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/06100000.xhp b/helpcontent2/source/text/shared/02/06100000.xhp
index 140e5d8637..f3a20b05f6 100644
--- a/helpcontent2/source/text/shared/02/06100000.xhp
+++ b/helpcontent2/source/text/shared/02/06100000.xhp
@@ -57,7 +57,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="E">
-<image id="img_id3149827" src="res/commandimagelist/sc_moveup.png" width="0.2228inch" height="0.2228inch"><alt id="alt_id3149827" xml-lang="en-US">Icon</alt>
+<image id="img_id3149827" src="cmd/sc_moveup.png" width="0.2228inch" height="0.2228inch"><alt id="alt_id3149827" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/06110000.xhp b/helpcontent2/source/text/shared/02/06110000.xhp
index a95a8e9456..757b8b9acb 100644
--- a/helpcontent2/source/text/shared/02/06110000.xhp
+++ b/helpcontent2/source/text/shared/02/06110000.xhp
@@ -57,7 +57,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="E">
-<image id="img_id3153577" src="res/commandimagelist/sc_outlinedown.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3153577" xml-lang="en-US">Icon</alt>
+<image id="img_id3153577" src="cmd/sc_outlinedown.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3153577" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/06120000.xhp b/helpcontent2/source/text/shared/02/06120000.xhp
index 97bfbfed6d..5eb7b5f1dc 100644
--- a/helpcontent2/source/text/shared/02/06120000.xhp
+++ b/helpcontent2/source/text/shared/02/06120000.xhp
@@ -61,7 +61,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150355" xml-lang="en-US" l10n="E">
-<image id="img_id3157909" src="res/commandimagelist/sc_defaultbullet.png" width="0.222inch" height="0.222inch"><alt id="alt_id3157909" xml-lang="en-US">Icon</alt>
+<image id="img_id3157909" src="cmd/sc_defaultbullet.png" width="0.222inch" height="0.222inch"><alt id="alt_id3157909" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/07070000.xhp b/helpcontent2/source/text/shared/02/07070000.xhp
index 5099822d34..b31e797143 100644
--- a/helpcontent2/source/text/shared/02/07070000.xhp
+++ b/helpcontent2/source/text/shared/02/07070000.xhp
@@ -60,7 +60,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145090" xml-lang="en-US" l10n="E">
-<image id="img_id3154751" src="res/commandimagelist/sc_editdoc.png" width="5.64mm" height="5.64mm"><alt id="alt_id3154751" xml-lang="en-US">Icon</alt>
+<image id="img_id3154751" src="cmd/sc_editdoc.png" width="5.64mm" height="5.64mm"><alt id="alt_id3154751" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/07070100.xhp b/helpcontent2/source/text/shared/02/07070100.xhp
index c08ce49b16..085beebc57 100644
--- a/helpcontent2/source/text/shared/02/07070100.xhp
+++ b/helpcontent2/source/text/shared/02/07070100.xhp
@@ -54,7 +54,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155805" xml-lang="en-US" l10n="E">
-<image id="img_id3152801" src="res/commandimagelist/sc_editdoc.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152801" xml-lang="en-US">Icon</alt>
+<image id="img_id3152801" src="cmd/sc_editdoc.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152801" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/07070200.xhp b/helpcontent2/source/text/shared/02/07070200.xhp
index 5df5eb265a..5df5eb265a 100755..100644
--- a/helpcontent2/source/text/shared/02/07070200.xhp
+++ b/helpcontent2/source/text/shared/02/07070200.xhp
diff --git a/helpcontent2/source/text/shared/02/09030000.xhp b/helpcontent2/source/text/shared/02/09030000.xhp
index c1aa71a1a7..80326b61f3 100644
--- a/helpcontent2/source/text/shared/02/09030000.xhp
+++ b/helpcontent2/source/text/shared/02/09030000.xhp
@@ -52,7 +52,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="E">
-<image id="img_id3156426" src="res/commandimagelist/sc_chainframes.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156426" xml-lang="en-US">Icon</alt>
+<image id="img_id3156426" src="cmd/sc_chainframes.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156426" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/09050000.xhp b/helpcontent2/source/text/shared/02/09050000.xhp
deleted file mode 100644
index eac4057168..0000000000
--- a/helpcontent2/source/text/shared/02/09050000.xhp
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--***********************************************************************
- *
- * 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.
- *
- ************************************************************************-->
-<helpdocument version="1.0">
-<meta>
-<topic id="textshared0209050000xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Find</title>
-<filename>/text/shared/02/09050000.xhp</filename>
-</topic>
-</meta>
-<body>
-  <section id="search">
-  <bookmark branch="hid/SVX_HID_OFA_HYPERLINK_SEARCH" xml-lang="en-US" id="bm_id3156211"/><paragraph id="hd_id3154228" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/shared/02/09050000.xhp" name="Find">Find</link></paragraph>
-<paragraph l10n="U" xml-lang="en-US" oldref="2" role="paragraph" id="par_id3159224"><ahelp visibility="visible" hid="HID_OFA_HYPERLINK_SEARCH">Click and choose one of the Internet search engines from the submenu. The search term is entered in the <emph>URL Name</emph> box.</ahelp> The list of search engines in the <emph>Find</emph> submenu is defined in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01020200.xhp" name="Internet - Search">Internet - Search</link></emph>.</paragraph>
-  </section>
-  <section id="sysearch">
-  <table id="tbl_id3147261">
-    <tablerow>
-     <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3152801" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_recsearch.png" id="img_id3153750"><alt xml-lang="en-US" id="alt_id3153750">Icon</alt></image></paragraph>
-     </tablecell>
-     <tablecell>
-      <paragraph role="paragraph" id="par_id3147008" l10n="U" xml-lang="en-US" oldref="3">Find</paragraph>
-     </tablecell>
-    </tablerow>
-  </table>
-  </section>
-  <paragraph role="heading" level="2" id="hd_id3153683" l10n="U" xml-lang="en-US" oldref="4">List of search engines</paragraph>
-  <paragraph xml-lang="en-US" role="paragraph" id="par_id3147576" l10n="U" oldref="5">When you have selected a search engine, $[officename] transfers the search request to your standard web browser, which then establishes an Internet connection to the search engine and displays the result. See also <link href="text/shared/02/09010000.xhp" name="URL Name">URL Name</link>.</paragraph>
- </body>
-</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/09070000.xhp b/helpcontent2/source/text/shared/02/09070000.xhp
index 17c18e78d0..d73412d23e 100644
--- a/helpcontent2/source/text/shared/02/09070000.xhp
+++ b/helpcontent2/source/text/shared/02/09070000.xhp
@@ -53,7 +53,7 @@
             <tablerow>
                <tablecell>
                   <paragraph xml-lang="en-US" id="par_id3154927" role="paragraph" l10n="E">
-<image id="img_id3093440" src="res/commandimagelist/sc_hyperlinkdialog.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3093440">Icon</alt>
+<image id="img_id3093440" src="cmd/sc_hyperlinkdialog.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3093440">Icon</alt>
 	</image></paragraph>
                </tablecell>
                <tablecell>
diff --git a/helpcontent2/source/text/shared/02/10010000.xhp b/helpcontent2/source/text/shared/02/10010000.xhp
index d570fe2254..3f67f72d3c 100644
--- a/helpcontent2/source/text/shared/02/10010000.xhp
+++ b/helpcontent2/source/text/shared/02/10010000.xhp
@@ -53,7 +53,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3155552" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_pageup.png" id="img_id3145090"><alt xml-lang="en-US" id="alt_id3145090">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3155552" xml-lang="en-US" oldref=""><image src="cmd/sc_pageup.png" id="img_id3145090"><alt xml-lang="en-US" id="alt_id3145090">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3147577" l10n="U" xml-lang="en-US" oldref="3">Previous Page</paragraph>
diff --git a/helpcontent2/source/text/shared/02/10020000.xhp b/helpcontent2/source/text/shared/02/10020000.xhp
index e9af26078e..8d720f4c75 100644
--- a/helpcontent2/source/text/shared/02/10020000.xhp
+++ b/helpcontent2/source/text/shared/02/10020000.xhp
@@ -53,7 +53,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3154186" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_pagedown.png" id="img_id3149346"><alt xml-lang="en-US" id="alt_id3149346">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3154186" xml-lang="en-US" oldref=""><image src="cmd/sc_pagedown.png" id="img_id3149346"><alt xml-lang="en-US" id="alt_id3149346">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3153682" l10n="U" xml-lang="en-US" oldref="3">Next Page</paragraph>
diff --git a/helpcontent2/source/text/shared/02/10030000.xhp b/helpcontent2/source/text/shared/02/10030000.xhp
index 047c0db016..8d6e883e24 100644
--- a/helpcontent2/source/text/shared/02/10030000.xhp
+++ b/helpcontent2/source/text/shared/02/10030000.xhp
@@ -53,7 +53,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3154751" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_gotostartofdoc.png" id="img_id3147571"><alt xml-lang="en-US" id="alt_id3147571">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3154751" xml-lang="en-US" oldref=""><image src="cmd/sc_gotostartofdoc.png" id="img_id3147571"><alt xml-lang="en-US" id="alt_id3147571">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph l10n="U" role="paragraph" id="par_id3143268" xml-lang="en-US" oldref="3"><switchinline select="appl"> <caseinline select="WRITER">To Document Begin</caseinline> <defaultinline>First Page</defaultinline> </switchinline></paragraph>
diff --git a/helpcontent2/source/text/shared/02/10040000.xhp b/helpcontent2/source/text/shared/02/10040000.xhp
index 7b3a835d82..d29259db12 100644
--- a/helpcontent2/source/text/shared/02/10040000.xhp
+++ b/helpcontent2/source/text/shared/02/10040000.xhp
@@ -53,7 +53,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3155805" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_gotoendofdoc.png" id="img_id3153394"><alt xml-lang="en-US" id="alt_id3153394">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3155805" xml-lang="en-US" oldref=""><image src="cmd/sc_gotoendofdoc.png" id="img_id3153394"><alt xml-lang="en-US" id="alt_id3153394">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph l10n="U" role="paragraph" id="par_id3145313" xml-lang="en-US" oldref="3"><switchinline select="appl"> <caseinline select="WRITER">To Document End</caseinline> <defaultinline>Last Page</defaultinline> </switchinline></paragraph>
diff --git a/helpcontent2/source/text/shared/02/12000000.xhp b/helpcontent2/source/text/shared/02/12000000.xhp
index 43972d2720..780058a904 100644
--- a/helpcontent2/source/text/shared/02/12000000.xhp
+++ b/helpcontent2/source/text/shared/02/12000000.xhp
@@ -49,7 +49,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153114" xml-lang="en-US" l10n="E">
-<image id="img_id3150710" src="res/commandimagelist/sc_dsbrowserexplorer.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150710" xml-lang="en-US">Icon</alt></image></paragraph>
+<image id="img_id3150710" src="cmd/sc_dsbrowserexplorer.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150710" xml-lang="en-US">Icon</alt></image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145136" xml-lang="en-US" l10n="U" oldref="3">Explorer On/Off</paragraph>
diff --git a/helpcontent2/source/text/shared/02/12010000.xhp b/helpcontent2/source/text/shared/02/12010000.xhp
index 04361f2275..6e722ac49f 100644
--- a/helpcontent2/source/text/shared/02/12010000.xhp
+++ b/helpcontent2/source/text/shared/02/12010000.xhp
@@ -49,7 +49,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="E">
-<image id="img_id3147276" src="res/commandimagelist/sc_sortascending.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3147276" xml-lang="en-US">Icon</alt>
+<image id="img_id3147276" src="cmd/sc_sortascending.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3147276" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/12020000.xhp b/helpcontent2/source/text/shared/02/12020000.xhp
index b73c53dc79..58d6040792 100644
--- a/helpcontent2/source/text/shared/02/12020000.xhp
+++ b/helpcontent2/source/text/shared/02/12020000.xhp
@@ -50,7 +50,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149496" xml-lang="en-US" l10n="E">
-<image id="img_id3153255" src="res/commandimagelist/sc_sortdescending.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3153255" xml-lang="en-US">Icon</alt>
+<image id="img_id3153255" src="cmd/sc_sortdescending.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3153255" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/12030000.xhp b/helpcontent2/source/text/shared/02/12030000.xhp
index fbefde6ad7..4709ff1e60 100644
--- a/helpcontent2/source/text/shared/02/12030000.xhp
+++ b/helpcontent2/source/text/shared/02/12030000.xhp
@@ -50,7 +50,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3151234" xml-lang="en-US" l10n="E">
-<image id="img_id3147261" src="res/commandimagelist/sc_formfiltered.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147261" xml-lang="en-US">Icon</alt>
+<image id="img_id3147261" src="cmd/sc_formfiltered.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147261" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/12040000.xhp b/helpcontent2/source/text/shared/02/12040000.xhp
index ddbba6ddb1..c0460deb8d 100644
--- a/helpcontent2/source/text/shared/02/12040000.xhp
+++ b/helpcontent2/source/text/shared/02/12040000.xhp
@@ -52,7 +52,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3146130" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_removefilter.png" id="img_id3151315"><alt xml-lang="en-US" id="alt_id3151315">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3146130" xml-lang="en-US" oldref=""><image src="cmd/sc_removefilter.png" id="img_id3151315"><alt xml-lang="en-US" id="alt_id3151315">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3153750" l10n="U" xml-lang="en-US" oldref="3">Remove Filter/Sorting</paragraph>
diff --git a/helpcontent2/source/text/shared/02/12050000.xhp b/helpcontent2/source/text/shared/02/12050000.xhp
index df8de0efa0..e4e9b71753 100644
--- a/helpcontent2/source/text/shared/02/12050000.xhp
+++ b/helpcontent2/source/text/shared/02/12050000.xhp
@@ -51,7 +51,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3147261" xml-lang="en-US" l10n="E">
-<image id="img_id3153910" src="res/commandimagelist/sc_reload.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153910" xml-lang="en-US">Icon</alt>
+<image id="img_id3153910" src="cmd/sc_reload.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153910" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/12070000.xhp b/helpcontent2/source/text/shared/02/12070000.xhp
index 9691864c35..2eb21dd5ef 100644
--- a/helpcontent2/source/text/shared/02/12070000.xhp
+++ b/helpcontent2/source/text/shared/02/12070000.xhp
@@ -50,7 +50,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154186" xml-lang="en-US" l10n="E">
-<image id="img_id3147291" src="res/commandimagelist/sc_sbabrwinsert.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147291" xml-lang="en-US">Icon</alt>
+<image id="img_id3147291" src="cmd/sc_sbabrwinsert.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147291" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/12070300.xhp b/helpcontent2/source/text/shared/02/12070300.xhp
index 4fee7f50cc..4fee7f50cc 100755..100644
--- a/helpcontent2/source/text/shared/02/12070300.xhp
+++ b/helpcontent2/source/text/shared/02/12070300.xhp
diff --git a/helpcontent2/source/text/shared/02/12080000.xhp b/helpcontent2/source/text/shared/02/12080000.xhp
index 407ab8f2e7..ed3540a20a 100644
--- a/helpcontent2/source/text/shared/02/12080000.xhp
+++ b/helpcontent2/source/text/shared/02/12080000.xhp
@@ -51,7 +51,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149205" xml-lang="en-US" l10n="E">
-<image id="img_id3154398" src="res/commandimagelist/sc_dsbinsertcontent.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154398" xml-lang="en-US">Icon</alt>
+<image id="img_id3154398" src="cmd/sc_dsbinsertcontent.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154398" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/12090000.xhp b/helpcontent2/source/text/shared/02/12090000.xhp
index cde5968547..913cf489e9 100644
--- a/helpcontent2/source/text/shared/02/12090000.xhp
+++ b/helpcontent2/source/text/shared/02/12090000.xhp
@@ -57,7 +57,7 @@
             <tablerow>
                <tablecell>
                   <paragraph xml-lang="en-US" id="par_id3152801" role="paragraph" l10n="E">
-<image id="img_id3147291" src="res/commandimagelist/sc_formfiltered.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3147291">Icon</alt>
+<image id="img_id3147291" src="cmd/sc_formfiltered.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3147291">Icon</alt>
 	</image></paragraph>
                </tablecell>
                <tablecell>
diff --git a/helpcontent2/source/text/shared/02/12090101.xhp b/helpcontent2/source/text/shared/02/12090101.xhp
index 414780557e..414780557e 100755..100644
--- a/helpcontent2/source/text/shared/02/12090101.xhp
+++ b/helpcontent2/source/text/shared/02/12090101.xhp
diff --git a/helpcontent2/source/text/shared/02/12110000.xhp b/helpcontent2/source/text/shared/02/12110000.xhp
index f68a10492a..78decab0c3 100644
--- a/helpcontent2/source/text/shared/02/12110000.xhp
+++ b/helpcontent2/source/text/shared/02/12110000.xhp
@@ -54,7 +54,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153394" xml-lang="en-US" l10n="E">
-<image id="img_id3147226" src="res/commandimagelist/sc_formfilter.png" width="0.564cm" height="0.564cm"><alt id="alt_id3147226" xml-lang="en-US">Icon</alt>
+<image id="img_id3147226" src="cmd/sc_formfilter.png" width="0.564cm" height="0.564cm"><alt id="alt_id3147226" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/12120000.xhp b/helpcontent2/source/text/shared/02/12120000.xhp
index 3448527782..be10946e5f 100644
--- a/helpcontent2/source/text/shared/02/12120000.xhp
+++ b/helpcontent2/source/text/shared/02/12120000.xhp
@@ -52,7 +52,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3149999" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_formfiltered.png" id="img_id3146130"><alt xml-lang="en-US" id="alt_id3146130">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3149999" xml-lang="en-US" oldref=""><image src="cmd/sc_formfiltered.png" id="img_id3146130"><alt xml-lang="en-US" id="alt_id3146130">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3145090" l10n="U" xml-lang="en-US" oldref="3">Apply Filter</paragraph>
diff --git a/helpcontent2/source/text/shared/02/12130000.xhp b/helpcontent2/source/text/shared/02/12130000.xhp
index 88cc076991..f909847fad 100644
--- a/helpcontent2/source/text/shared/02/12130000.xhp
+++ b/helpcontent2/source/text/shared/02/12130000.xhp
@@ -55,7 +55,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3093440" xml-lang="en-US" l10n="E">
-<image id="img_id3156414" src="res/commandimagelist/sc_viewformasgrid.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156414" xml-lang="en-US">Icon</alt>
+<image id="img_id3156414" src="cmd/sc_viewformasgrid.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156414" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/12140000.xhp b/helpcontent2/source/text/shared/02/12140000.xhp
index ef08b06a09..777569a8b3 100644
--- a/helpcontent2/source/text/shared/02/12140000.xhp
+++ b/helpcontent2/source/text/shared/02/12140000.xhp
@@ -53,7 +53,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155616" xml-lang="en-US" l10n="E">
-<image id="img_id3147043" src="res/commandimagelist/sc_dsbdocumentdatasource.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147043" xml-lang="en-US">Icon</alt>
+<image id="img_id3147043" src="cmd/sc_dsbdocumentdatasource.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147043" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/13010000.xhp b/helpcontent2/source/text/shared/02/13010000.xhp
index a91fe00d7e..a91fe00d7e 100755..100644
--- a/helpcontent2/source/text/shared/02/13010000.xhp
+++ b/helpcontent2/source/text/shared/02/13010000.xhp
diff --git a/helpcontent2/source/text/shared/02/14010000.xhp b/helpcontent2/source/text/shared/02/14010000.xhp
index 933c262406..4d74202fba 100644
--- a/helpcontent2/source/text/shared/02/14010000.xhp
+++ b/helpcontent2/source/text/shared/02/14010000.xhp
@@ -54,7 +54,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155941" xml-lang="en-US" l10n="E">
-<image id="img_id3153311" src="res/commandimagelist/sc_sbaexecutesql.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153311" xml-lang="en-US">Icon</alt>
+<image id="img_id3153311" src="cmd/sc_sbaexecutesql.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153311" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/14020000.xhp b/helpcontent2/source/text/shared/02/14020000.xhp
index 164963140e..0d65213faf 100644
--- a/helpcontent2/source/text/shared/02/14020000.xhp
+++ b/helpcontent2/source/text/shared/02/14020000.xhp
@@ -51,7 +51,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3154422" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_dbclearquery.png" id="img_id3149205"><alt xml-lang="en-US" id="alt_id3149205">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3154422" xml-lang="en-US" oldref=""><image src="cmd/sc_dbclearquery.png" id="img_id3149205"><alt xml-lang="en-US" id="alt_id3149205">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3150789" l10n="U" xml-lang="en-US" oldref="3">Clear query</paragraph>
diff --git a/helpcontent2/source/text/shared/02/14020200.xhp b/helpcontent2/source/text/shared/02/14020200.xhp
index c46c88b2ff..910bf1a837 100644
--- a/helpcontent2/source/text/shared/02/14020200.xhp
+++ b/helpcontent2/source/text/shared/02/14020200.xhp
@@ -52,7 +52,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149140" xml-lang="en-US" l10n="E">
-<image id="img_id3152918" src="res/commandimagelist/sc_dbchangedesignmode.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152918" xml-lang="en-US">Icon</alt>
+<image id="img_id3152918" src="cmd/sc_dbchangedesignmode.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152918" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/14030000.xhp b/helpcontent2/source/text/shared/02/14030000.xhp
index bb484e140d..e8613096ac 100644
--- a/helpcontent2/source/text/shared/02/14030000.xhp
+++ b/helpcontent2/source/text/shared/02/14030000.xhp
@@ -53,7 +53,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145136" xml-lang="en-US" l10n="E">
-<image id="img_id3147226" src="res/commandimagelist/sc_sbanativesql.png"  ><alt id="alt_id3147226" xml-lang="en-US">Icon</alt>
+<image id="img_id3147226" src="cmd/sc_sbanativesql.png"  ><alt id="alt_id3147226" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/14040000.xhp b/helpcontent2/source/text/shared/02/14040000.xhp
index 253bbf6328..18f1c6be34 100644
--- a/helpcontent2/source/text/shared/02/14040000.xhp
+++ b/helpcontent2/source/text/shared/02/14040000.xhp
@@ -51,7 +51,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3149205" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_dbviewfunctions.png" id="img_id3154399"><alt xml-lang="en-US" id="alt_id3154399">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3149205" xml-lang="en-US" oldref=""><image src="cmd/sc_dbviewfunctions.png" id="img_id3154399"><alt xml-lang="en-US" id="alt_id3154399">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3145669" l10n="U" xml-lang="en-US" oldref="3">Functions</paragraph>
diff --git a/helpcontent2/source/text/shared/02/14050000.xhp b/helpcontent2/source/text/shared/02/14050000.xhp
index eacee49500..3b0f3d7e50 100644
--- a/helpcontent2/source/text/shared/02/14050000.xhp
+++ b/helpcontent2/source/text/shared/02/14050000.xhp
@@ -50,7 +50,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154116" xml-lang="en-US" l10n="E">
-<image id="img_id3149760" src="res/commandimagelist/sc_dbviewtablenames.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149760" xml-lang="en-US">Icon</alt>
+<image id="img_id3149760" src="cmd/sc_dbviewtablenames.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149760" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/14060000.xhp b/helpcontent2/source/text/shared/02/14060000.xhp
index 1daff45803..9fcbaaaf2b 100644
--- a/helpcontent2/source/text/shared/02/14060000.xhp
+++ b/helpcontent2/source/text/shared/02/14060000.xhp
@@ -51,7 +51,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3150808" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_dbviewaliases.png" id="img_id3151315"><alt xml-lang="en-US" id="alt_id3151315">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3150808" xml-lang="en-US" oldref=""><image src="cmd/sc_dbviewaliases.png" id="img_id3151315"><alt xml-lang="en-US" id="alt_id3151315">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3151234" l10n="U" xml-lang="en-US" oldref="3">Alias</paragraph>
diff --git a/helpcontent2/source/text/shared/02/14070000.xhp b/helpcontent2/source/text/shared/02/14070000.xhp
index 0244bf3695..94028b521a 100644
--- a/helpcontent2/source/text/shared/02/14070000.xhp
+++ b/helpcontent2/source/text/shared/02/14070000.xhp
@@ -53,7 +53,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149511" xml-lang="en-US" l10n="E">
-<image id="img_id3156302" src="res/commandimagelist/sc_dbdistinctvalues.png" width="5.64mm" height="5.64mm"><alt id="alt_id3156302" xml-lang="en-US">Icon</alt>
+<image id="img_id3156302" src="cmd/sc_dbdistinctvalues.png" width="5.64mm" height="5.64mm"><alt id="alt_id3156302" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/18010000.xhp b/helpcontent2/source/text/shared/02/18010000.xhp
index 2661130b2d..6541f3a244 100644
--- a/helpcontent2/source/text/shared/02/18010000.xhp
+++ b/helpcontent2/source/text/shared/02/18010000.xhp
@@ -50,7 +50,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149511" xml-lang="en-US" l10n="E">
-<image id="img_id3159194" src="res/commandimagelist/sc_drawselect.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159194" xml-lang="en-US">Icon</alt>
+<image id="img_id3159194" src="cmd/sc_drawselect.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159194" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/18030000.xhp b/helpcontent2/source/text/shared/02/18030000.xhp
index de1f8f1be8..40b7575163 100644
--- a/helpcontent2/source/text/shared/02/18030000.xhp
+++ b/helpcontent2/source/text/shared/02/18030000.xhp
@@ -51,7 +51,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3150040" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_spellonline.png" id="img_id3150808"><alt xml-lang="en-US" id="alt_id3150808">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3150040" xml-lang="en-US" oldref=""><image src="cmd/sc_spellonline.png" id="img_id3150808"><alt xml-lang="en-US" id="alt_id3150808">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3147571" l10n="U" xml-lang="en-US" oldref="2">AutoSpellcheck On/Off</paragraph>
diff --git a/helpcontent2/source/text/shared/02/24010000.xhp b/helpcontent2/source/text/shared/02/24010000.xhp
index 76e2985b44..0d10f510e0 100644
--- a/helpcontent2/source/text/shared/02/24010000.xhp
+++ b/helpcontent2/source/text/shared/02/24010000.xhp
@@ -53,7 +53,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154673" xml-lang="en-US" l10n="E">
-<image id="img_id3152924" src="res/commandimagelist/sc_graphicfiltertoolbox.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152924" xml-lang="en-US">Icon</alt>
+<image id="img_id3152924" src="cmd/sc_graphicfiltertoolbox.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152924" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -72,7 +72,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153681" xml-lang="en-US" l10n="E">
-<image id="img_id3145313" src="res/commandimagelist/sc_graphicfilterinvert.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145313" xml-lang="en-US">Icon</alt>
+<image id="img_id3145313" src="cmd/sc_graphicfilterinvert.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145313" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -90,7 +90,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149514" xml-lang="en-US" l10n="E">
-<image id="img_id3154285" src="res/commandimagelist/sc_graphicfiltersmooth.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154285" xml-lang="en-US">Icon</alt>
+<image id="img_id3154285" src="cmd/sc_graphicfiltersmooth.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154285" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -108,7 +108,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153480" xml-lang="en-US" l10n="E">
-<image id="img_id3156023" src="res/commandimagelist/sc_graphicfiltersharpen.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156023" xml-lang="en-US">Icon</alt>
+<image id="img_id3156023" src="cmd/sc_graphicfiltersharpen.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156023" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -126,7 +126,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154938" xml-lang="en-US" l10n="E">
-<image id="img_id3153797" src="res/commandimagelist/sc_graphicfilterremovenoise.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153797" xml-lang="en-US">Icon</alt>
+<image id="img_id3153797" src="cmd/sc_graphicfilterremovenoise.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153797" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -143,7 +143,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3148453" xml-lang="en-US" l10n="E">
-<image id="img_id3154329" src="res/commandimagelist/sc_graphicfiltersolarize.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154329" xml-lang="en-US">Icon</alt>
+<image id="img_id3154329" src="cmd/sc_graphicfiltersolarize.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154329" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -168,7 +168,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153139" xml-lang="en-US" l10n="E">
-<image id="img_id3159196" src="res/commandimagelist/sc_graphicfiltersepia.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159196" xml-lang="en-US">Icon</alt>
+<image id="img_id3159196" src="cmd/sc_graphicfiltersepia.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159196" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -188,7 +188,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155851" xml-lang="en-US" l10n="E">
-<image id="img_id3150658" src="res/commandimagelist/sc_graphicfilterposter.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150658" xml-lang="en-US">Icon</alt>
+<image id="img_id3150658" src="cmd/sc_graphicfilterposter.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150658" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -208,7 +208,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3148495" xml-lang="en-US" l10n="E">
-<image id="img_id3156437" src="res/commandimagelist/sc_graphicfilterpopart.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156437" xml-lang="en-US">Icon</alt>
+<image id="img_id3156437" src="cmd/sc_graphicfilterpopart.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156437" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -225,7 +225,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150327" xml-lang="en-US" l10n="E">
-<image id="img_id3154636" src="res/commandimagelist/sc_graphicfiltersobel.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154636" xml-lang="en-US">Icon</alt>
+<image id="img_id3154636" src="cmd/sc_graphicfiltersobel.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154636" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -242,7 +242,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154756" xml-lang="en-US" l10n="E">
-<image id="img_id3154256" src="res/commandimagelist/sc_graphicfilterrelief.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154256" xml-lang="en-US">Icon</alt>
+<image id="img_id3154256" src="cmd/sc_graphicfilterrelief.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154256" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -261,7 +261,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3146316" xml-lang="en-US" l10n="E">
-<image id="img_id3155939" src="res/commandimagelist/sc_graphicfiltermosaic.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155939" xml-lang="en-US">Icon</alt>
+<image id="img_id3155939" src="cmd/sc_graphicfiltermosaic.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155939" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/24100000.xhp b/helpcontent2/source/text/shared/02/24100000.xhp
index 938ded1dc5..0e22c046c8 100644
--- a/helpcontent2/source/text/shared/02/24100000.xhp
+++ b/helpcontent2/source/text/shared/02/24100000.xhp
@@ -53,7 +53,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id0522200809440491" xml-lang="en-US" l10n="NEW">
-<image id="img_id0522200809434429" src="res/commandimagelist/sc_crop.png" width="0.1665in" height="0.1665in"><alt id="alt_id0522200809434429" xml-lang="en-US">icon</alt>
+<image id="img_id0522200809434429" src="cmd/sc_crop.png" width="0.1665in" height="0.1665in"><alt id="alt_id0522200809434429" xml-lang="en-US">icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/shared/02/colortoolbar.xhp b/helpcontent2/source/text/shared/02/colortoolbar.xhp
index f8607e3ce3..f8607e3ce3 100755..100644
--- a/helpcontent2/source/text/shared/02/colortoolbar.xhp
+++ b/helpcontent2/source/text/shared/02/colortoolbar.xhp
diff --git a/helpcontent2/source/text/shared/02/makefile.mk b/helpcontent2/source/text/shared/02/makefile.mk
index 52463f6be3..ff1f0cdd46 100644
--- a/helpcontent2/source/text/shared/02/makefile.mk
+++ b/helpcontent2/source/text/shared/02/makefile.mk
@@ -115,7 +115,6 @@ XHPFILES = \
    09010000.xhp \
    09020000.xhp \
    09030000.xhp \
-   09050000.xhp \
    09060000.xhp \
    09070000.xhp \
    09070100.xhp \
diff --git a/helpcontent2/source/text/shared/02/paintbrush.xhp b/helpcontent2/source/text/shared/02/paintbrush.xhp
index a854751799..25cb2ef60c 100644
--- a/helpcontent2/source/text/shared/02/paintbrush.xhp
+++ b/helpcontent2/source/text/shared/02/paintbrush.xhp
@@ -45,7 +45,7 @@
 <paragraph role="paragraph" id="par_idN1057A" xml-lang="en-US" l10n="CHG"><ahelp hid=".">First select some text or an object, then click this icon. Then click on or drag across other text or click an object to apply the same formatting.</ahelp><comment>i93691</comment></paragraph>
 <section id="howtoget">
 <paragraph role="paragraph" id="par_idN10617" xml-lang="en-US" l10n="NEW">Click the <emph>Format Paintbrush</emph> icon 
-<image id="img_id3610034" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.423cm" height="0.423cm"><alt id="alt_id3610034" xml-lang="en-US">Icon</alt>
+<image id="img_id3610034" src="cmd/sc_formatpaintbrush.png" width="0.423cm" height="0.423cm"><alt id="alt_id3610034" xml-lang="en-US">Icon</alt>
 	</image> on the <emph>Standard</emph> toolbar. </paragraph>
 </section>
 <section id="sypaintbrush">
@@ -53,7 +53,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_idN10639" xml-lang="en-US" l10n="NEW">
-<image id="img_id5406964" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.423cm" height="0.423cm"><alt id="alt_id5406964" xml-lang="en-US">Icon</alt>
+<image id="img_id5406964" src="cmd/sc_formatpaintbrush.png" width="0.423cm" height="0.423cm"><alt id="alt_id5406964" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/shared/04/01010000.xhp b/helpcontent2/source/text/shared/04/01010000.xhp
index 56b326df25..903840444e 100755..100644
--- a/helpcontent2/source/text/shared/04/01010000.xhp
+++ b/helpcontent2/source/text/shared/04/01010000.xhp
@@ -224,7 +224,7 @@
                <paragraph xml-lang="en-US" id="par_idN10BC0" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Control</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+M</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_idN10BE8" role="tablecontent" l10n="NEW">Removes direct formatting from selected text or objects (as in <emph>Format - Default Formatting</emph>)</paragraph>
+               <paragraph xml-lang="en-US" id="par_idN10BE8" role="tablecontent" l10n="NEW">Removes direct formatting from selected text or objects (as in <emph>Format - Clear Direct Formatting</emph>)</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
diff --git a/helpcontent2/source/text/shared/04/01020000.xhp b/helpcontent2/source/text/shared/04/01020000.xhp
index 583afa6796..583afa6796 100755..100644
--- a/helpcontent2/source/text/shared/04/01020000.xhp
+++ b/helpcontent2/source/text/shared/04/01020000.xhp
diff --git a/helpcontent2/source/text/shared/05/00000001.xhp b/helpcontent2/source/text/shared/05/00000001.xhp
index 84d2171457..5990842ca2 100644
--- a/helpcontent2/source/text/shared/05/00000001.xhp
+++ b/helpcontent2/source/text/shared/05/00000001.xhp
@@ -46,25 +46,24 @@
 </bookmark>
 <paragraph xml-lang="en-US" id="hd_id3146873" role="heading" level="1" l10n="U" oldref="1"><variable id="00000001"><link href="text/shared/05/00000001.xhp" name="Getting Support">Getting Support</link>
 </variable></paragraph>
-         <paragraph xml-lang="en-US" id="par_id9173253" role="paragraph" l10n="NEW">Many questions and answers are the same for OpenOffice.org software and for the commercial office software.</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3150667" role="paragraph" l10n="CHG" oldref="8">You can find support on the OpenOffice.org website at <link href="http://support.openoffice.org">support.openoffice.org</link>.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150667" role="paragraph" l10n="CHG" oldref="8">You can find support on the %PRODUCTNAME website at <link href="http://www.libreoffice.org/get-help/">www.libreoffice.org</link>.</paragraph>
 
          <paragraph xml-lang="en-US" id="par_id3154230" role="paragraph" l10n="U" oldref="3">For a summary of the current support services refer to the <emph>Readme</emph> file in the <item type="productname">%PRODUCTNAME</item> folder.</paragraph>
 <paragraph xml-lang="en-US" id="hd_id26327" role="heading" level="2" l10n="NEW">Local language support pages</paragraph>
-         <paragraph xml-lang="en-US" id="par_id1318380" role="paragraph" l10n="CHG">The OpenOffice.org localization projects offer support pages in local languages. Find an overview of the native language projects at <link href="http://projects.openoffice.org/native-lang.html">projects.openoffice.org/native-lang.html</link>. You can find help and support in English language on the OpenOffice.org website at <link href="http://support.openoffice.org">support.openoffice.org</link>.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id1318380" role="paragraph" l10n="CHG">The %PRODUCTNAME localization projects offer support pages in local languages. Find an overview of the native language projects at <link href="http://www.libreoffice.org/international-sites/">http://www.libreoffice.org/international-sites/</link>. You can find help and support in English language on the %PRODUCTNAME website at <link href="http://www.libreoffice.org/get-help/">www.libreoffice.org</link>.</paragraph>
          <paragraph xml-lang="en-US" id="hd_id2611386" role="heading" level="2" l10n="NEW">Mailing lists</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3166335" role="paragraph" l10n="NEW">Ask about OpenOffice.org, find help by volunteers, and discuss topics on the public mailing lists. You can find many general and specialized mailing lists on the OpenOffice.org website at <link href="http://www.openoffice.org/mail_list.html">www.openoffice.org/mail_list.html</link>.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3166335" role="paragraph" l10n="NEW">Ask about %PRODUCTNAME, find help by volunteers, and discuss topics on the public mailing lists. You can find many general and specialized mailing lists on the %PRODUCTNAME website at <link href="http://www.libreoffice.org/get-help/mailing-lists/">www.libreoffice.org/get-help/mailing-lists/</link>.</paragraph>
          <paragraph xml-lang="en-US" id="hd_id0915200811081722" role="heading" level="2" l10n="NEW">Forum</paragraph>
-         <paragraph xml-lang="en-US" id="par_id0915200811081778" role="paragraph" l10n="NEW">You can access web forums to ask and answer questions about OpenOffice.org.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0915200811081778" role="paragraph" l10n="NEW">You can access web forums to ask and answer questions about %PRODUCTNAME.</paragraph>
          <paragraph xml-lang="en-US" id="hd_id0804200803314150" role="heading" level="2" l10n="NEW">Security</paragraph>
-         <paragraph xml-lang="en-US" id="par_id0804200803314235" role="paragraph" l10n="NEW">In case you are concerned about any security issue with using this software, you can contact the developers on the public mail list dev@openoffice.org. If you want to discuss any issue with other users, send an email to the public mail list discuss@openoffice.org.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0804200803314235" role="paragraph" l10n="NEW">In case you are concerned about any security issue with using this software, you can contact the developers on the <link href="http://lists.freedesktop.org/mailman/listinfo/libreoffice">public mail list</link>. If you want to discuss any issue with other users, send an email to the public mail list users@libreoffice.org.</paragraph>
          <paragraph xml-lang="en-US" id="hd_id3168534" role="heading" level="2" l10n="NEW">Downloads</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3028143" role="paragraph" l10n="CHG">You can download the latest version of OpenOffice.org at <link href="http://download.openoffice.org/">download.openoffice.org</link>.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3028143" role="paragraph" l10n="CHG">You can download the latest version of %PRODUCTNAME at <link href="http://www.libreoffice.org/download/">www.libreoffice.org/download/</link>.</paragraph>
          <paragraph xml-lang="en-US" id="hd_id2602967" role="heading" level="2" l10n="NEW">Documentation</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3497211" role="paragraph" l10n="NEW">You can download documentation as PDF files, how-tos, and guides from the OpenOffice.org website at <link href="http://documentation.openoffice.org">documentation.openoffice.org</link>.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3497211" role="paragraph" l10n="NEW">You can download documentation as PDF files, how-tos, and guides from the %PRODUCTNAME website at <link href="http://www.libreoffice.org/get-help/documentation/">www.libreoffice.org/get-help/documentation/</link>.</paragraph>
          <paragraph xml-lang="en-US" id="hd_id0120200910361765" role="heading" level="2" l10n="NEW">Participate and give back</paragraph>
-         <paragraph xml-lang="en-US" id="par_id0120200910361848" role="paragraph" l10n="NEW">If you want to take an active role in the worldwide OpenOffice.org community, you are very welcome to give feedback, discuss features, propose enhancements, write your own article in an FAQ, how-to, manual, create a video tutorial, etc.</paragraph>
-         <paragraph xml-lang="en-US" id="par_id0120200910361874" role="paragraph" l10n="NEW">Visit the <link href="http://documentation.openoffice.org/">documentation web site</link> or the <link href="http://wiki.services.openoffice.org/wiki/Documentation">Wiki starting page</link> and follow the links for contributors.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0120200910361848" role="paragraph" l10n="NEW">If you want to take an active role in the worldwide %PRODUCTNAME community, you are very welcome to give feedback, discuss features, propose enhancements, write your own article in an FAQ, how-to, manual, create a video tutorial, etc.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0120200910361874" role="paragraph" l10n="NEW">Visit the <link href="http://www.libreoffice.org/get-involved/">Get involved page on the website</link> and follow the links for contributors.</paragraph>
       </section>
    </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/05/00000100.xhp b/helpcontent2/source/text/shared/05/00000100.xhp
index 85464efbd6..85464efbd6 100755..100644
--- a/helpcontent2/source/text/shared/05/00000100.xhp
+++ b/helpcontent2/source/text/shared/05/00000100.xhp
diff --git a/helpcontent2/source/text/shared/05/00000110.xhp b/helpcontent2/source/text/shared/05/00000110.xhp
index 2798e48b30..af33078485 100644
--- a/helpcontent2/source/text/shared/05/00000110.xhp
+++ b/helpcontent2/source/text/shared/05/00000110.xhp
@@ -72,7 +72,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3149415" role="paragraph" l10n="E">
-<image id="img_id3159399" src="res/commandimagelist/sc_browseforward.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3159399">Icon</alt>
+<image id="img_id3159399" src="cmd/sc_browseforward.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3159399">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
@@ -94,7 +94,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3149797" role="paragraph" l10n="E">
-<image id="img_id3155434" src="res/commandimagelist/sc_print.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155434">Icon</alt>
+<image id="img_id3155434" src="cmd/sc_print.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155434">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
@@ -116,7 +116,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_idN108D9" role="paragraph" l10n="NEW">
-<image id="img_id7358623" src="res/commandimagelist/sc_recsearch.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id7358623">Search icon</alt>
+<image id="img_id7358623" src="cmd/sc_recsearch.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id7358623">Search icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
diff --git a/helpcontent2/source/text/shared/05/00000120.xhp b/helpcontent2/source/text/shared/05/00000120.xhp
index f3dbbf6eaf..a79e70e332 100755..100644
--- a/helpcontent2/source/text/shared/05/00000120.xhp
+++ b/helpcontent2/source/text/shared/05/00000120.xhp
@@ -10,9 +10,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/autopi/01120100.xhp b/helpcontent2/source/text/shared/autopi/01120100.xhp
index 131d3379a4..131d3379a4 100755..100644
--- a/helpcontent2/source/text/shared/autopi/01120100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01120100.xhp
diff --git a/helpcontent2/source/text/shared/autopi/01120200.xhp b/helpcontent2/source/text/shared/autopi/01120200.xhp
index 076065d272..076065d272 100755..100644
--- a/helpcontent2/source/text/shared/autopi/01120200.xhp
+++ b/helpcontent2/source/text/shared/autopi/01120200.xhp
diff --git a/helpcontent2/source/text/shared/autopi/01120300.xhp b/helpcontent2/source/text/shared/autopi/01120300.xhp
index f2d9fe04e5..f2d9fe04e5 100755..100644
--- a/helpcontent2/source/text/shared/autopi/01120300.xhp
+++ b/helpcontent2/source/text/shared/autopi/01120300.xhp
diff --git a/helpcontent2/source/text/shared/autopi/01120500.xhp b/helpcontent2/source/text/shared/autopi/01120500.xhp
index af0428d327..af0428d327 100755..100644
--- a/helpcontent2/source/text/shared/autopi/01120500.xhp
+++ b/helpcontent2/source/text/shared/autopi/01120500.xhp
diff --git a/helpcontent2/source/text/shared/autopi/01150000.xhp b/helpcontent2/source/text/shared/autopi/01150000.xhp
index 83ea97d1d5..bda838e047 100644
--- a/helpcontent2/source/text/shared/autopi/01150000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01150000.xhp
@@ -96,7 +96,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155415" xml-lang="en-US" l10n="E">
-<image id="img_id3150417" src="res/commandimagelist/sc_euroconverter.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150417" xml-lang="en-US">Icon</alt>
+<image id="img_id3150417" src="cmd/sc_euroconverter.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150417" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/autopi/01170200.xhp b/helpcontent2/source/text/shared/autopi/01170200.xhp
index f57f0fdd63..f57f0fdd63 100755..100644
--- a/helpcontent2/source/text/shared/autopi/01170200.xhp
+++ b/helpcontent2/source/text/shared/autopi/01170200.xhp
diff --git a/helpcontent2/source/text/shared/autopi/01170300.xhp b/helpcontent2/source/text/shared/autopi/01170300.xhp
index bf5677dfec..bf5677dfec 100755..100644
--- a/helpcontent2/source/text/shared/autopi/01170300.xhp
+++ b/helpcontent2/source/text/shared/autopi/01170300.xhp
diff --git a/helpcontent2/source/text/shared/autopi/01170500.xhp b/helpcontent2/source/text/shared/autopi/01170500.xhp
index 17e22aa0f8..17e22aa0f8 100755..100644
--- a/helpcontent2/source/text/shared/autopi/01170500.xhp
+++ b/helpcontent2/source/text/shared/autopi/01170500.xhp
diff --git a/helpcontent2/source/text/shared/autopi/makefile.mk b/helpcontent2/source/text/shared/autopi/makefile.mk
index 945a27e1db..3d04950311 100644
--- a/helpcontent2/source/text/shared/autopi/makefile.mk
+++ b/helpcontent2/source/text/shared/autopi/makefile.mk
@@ -110,7 +110,6 @@ XHPFILES = \
    01170400.xhp \
    01170500.xhp \
    purchase.xhp \
-   startup.xhp \
    webwizard00.xhp \
    webwizard01.xhp \
    webwizard02.xhp \
diff --git a/helpcontent2/source/text/shared/autopi/startup.xhp b/helpcontent2/source/text/shared/autopi/startup.xhp
deleted file mode 100644
index 4d6f7328d7..0000000000
--- a/helpcontent2/source/text/shared/autopi/startup.xhp
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<helpdocument version="1.0">
-	
-<!--
-***********************************************************************
- *
- * 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.
- *
- ************************************************************************
- -->
- 
-	
-<meta>
-<topic id="textsharedautopistartupxhp" indexer="include">
-<title id="tit" xml-lang="en-US">Start-up Wizard</title>
-<filename>/text/shared/autopi/startup.xhp</filename>
-</topic>
-</meta>
-<body>
-<paragraph role="heading" id="par_idN1054C" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/autopi/startup.xhp">Start-up Wizard</link></paragraph>
-<paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW">The Start-up Wizard opens when you start %PRODUCTNAME for the first time.</paragraph>
-<paragraph role="paragraph" id="par_idN1055F" xml-lang="en-US" l10n="NEW">The wizard consists of the following pages:</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DESKTOP_HID_FIRSTSTART_WELCOME" id="bm_id8871120" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/DESKTOP_HID_FIRSTSTART_DIALOG" id="bm_id3778496" localize="false"/>
-<paragraph role="heading" id="par_idN10562" xml-lang="en-US" level="2" l10n="NEW">Welcome</paragraph>
-<paragraph role="paragraph" id="par_idN10566" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Start-up Wizard helps you to specify the user settings for %PRODUCTNAME. This wizard only runs once.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DESKTOP_HID_FIRSTSTART_LICENSE" id="bm_id9530930" localize="false"/>
-<paragraph role="heading" id="par_idN10575" xml-lang="en-US" level="2" l10n="NEW">License</paragraph>
-<paragraph role="paragraph" id="par_idN10579" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Read and accept the license text to continue. You need to scroll to the end of the license text before you can continue. If you decline the license, the installation is canceled.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DESKTOP_HID_FIRSTSTART_MIGRATION" id="bm_id4303415" localize="false"/>
-<paragraph role="heading" id="par_idN10588" xml-lang="en-US" level="2" l10n="NEW">Migration</paragraph>
-<paragraph role="paragraph" id="par_idN1058C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">You can use this page to import user data from a previously installed version of %PRODUCTNAME.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN1059F" xml-lang="en-US" level="3" l10n="NEW">Copy personal data</paragraph>
-<paragraph role="paragraph" id="par_idN105A3" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Copies the user name and other data from a previous %PRODUCTNAME installation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DESKTOP_HID_FIRSTSTART_USER" id="bm_id9908444" localize="false"/>
-<paragraph role="heading" id="par_idN105B2" xml-lang="en-US" level="2" l10n="NEW">User name</paragraph>
-<paragraph role="paragraph" id="par_idN105B6" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The user name is used for the document properties, templates, and when you record changes made to documents. This page is only displayed if a previous installation of %PRODUCTNAME is not found on your computer.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN105C8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter your personal data into the text boxes.</ahelp></paragraph>
-<embed href="text/shared/01/08060100.xhp#registrierung"/>
-</body>
-</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/02000002.xhp b/helpcontent2/source/text/shared/explorer/database/02000002.xhp
index e892039082..e892039082 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/02000002.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/02000002.xhp
diff --git a/helpcontent2/source/text/shared/explorer/database/04030000.xhp b/helpcontent2/source/text/shared/explorer/database/04030000.xhp
index 76f4e3834e..c6c92bb69c 100644
--- a/helpcontent2/source/text/shared/explorer/database/04030000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/04030000.xhp
@@ -49,10 +49,10 @@
 <paragraph role="paragraph" id="par_id3145382" xml-lang="en-US" l10n="CHG" oldref="3">Open the Form Controls toolbar. The Form Controls toolbar contains the <link href="text/shared/02/01170000.xhp" name="functions">functions</link> needed to edit a form. More functions can be found in the <emph>Form Design</emph> bar and <emph>More Controls</emph> bar.</paragraph>
 <paragraph role="paragraph" id="par_id3153146" xml-lang="en-US" l10n="U" oldref="5">In the form design you can <link href="text/shared/02/01170000.xhp" name="include controls">include controls</link>, <link href="text/shared/02/01170100.xhp" name="apply properties">apply properties</link> to them, define <link href="text/shared/02/01170200.xhp" name="Form properties">Form properties</link>, and <link href="text/shared/02/01170203.xhp" name="define subforms">define subforms</link>.</paragraph>
 <paragraph role="paragraph" id="par_id3154924" xml-lang="en-US" l10n="CHG" oldref="9">The<emph> Form Navigator</emph> icon 
-<image id="img_id3156002" src="res/commandimagelist/sc_showfmexplorer.png" width="4.23mm" height="4.23mm"><alt id="alt_id3156002" xml-lang="en-US">Icon</alt>
+<image id="img_id3156002" src="cmd/sc_showfmexplorer.png" width="4.23mm" height="4.23mm"><alt id="alt_id3156002" xml-lang="en-US">Icon</alt>
 	</image> on the Form Design bar opens the <link href="text/shared/02/01170600.xhp" name="Form Navigator"><emph>Form Navigator</emph></link>.</paragraph>
 <paragraph role="paragraph" id="par_id3153968" xml-lang="en-US" l10n="CHG" oldref="6">The <link href="text/shared/02/01171000.xhp" name="Open in Design Mode"><emph>Open in Design Mode</emph></link> icon 
-<image id="img_id1871395" src="res/commandimagelist/sc_openreadonly.png" width="5.59mm" height="5.59mm"><alt id="alt_id1871395" xml-lang="en-US">Icon</alt>
+<image id="img_id1871395" src="cmd/sc_openreadonly.png" width="5.59mm" height="5.59mm"><alt id="alt_id1871395" xml-lang="en-US">Icon</alt>
 	</image> allows you to save a form document so that it always opens in editing mode.</paragraph>
 <paragraph role="paragraph" id="par_id3154948" xml-lang="en-US" l10n="U" oldref="8">If there is an error when assigning properties to the objects contained in the form (for example, when assigning a non-existent database table to an object), a corresponding error message appears. This error message may contain a <emph>More</emph> button. <ahelp hid="dummy">If you click <emph>More</emph>, a dialog displaying more information about the current problem appears.</ahelp></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/explorer/database/05000000.xhp b/helpcontent2/source/text/shared/explorer/database/05000000.xhp
index 13d759c2c3..13d759c2c3 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/05000000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05000000.xhp
diff --git a/helpcontent2/source/text/shared/explorer/database/05000002.xhp b/helpcontent2/source/text/shared/explorer/database/05000002.xhp
index 2eb18398c3..2eb18398c3 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/05000002.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05000002.xhp
diff --git a/helpcontent2/source/text/shared/explorer/database/05000003.xhp b/helpcontent2/source/text/shared/explorer/database/05000003.xhp
index 219f2a70c8..219f2a70c8 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/05000003.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05000003.xhp
diff --git a/helpcontent2/source/text/shared/explorer/database/05030000.xhp b/helpcontent2/source/text/shared/explorer/database/05030000.xhp
index 5e1085234f..5e1085234f 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/05030000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05030000.xhp
diff --git a/helpcontent2/source/text/shared/explorer/database/05030200.xhp b/helpcontent2/source/text/shared/explorer/database/05030200.xhp
index a18e4b9bdb..a18e4b9bdb 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/05030200.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05030200.xhp
diff --git a/helpcontent2/source/text/shared/explorer/database/05040000.xhp b/helpcontent2/source/text/shared/explorer/database/05040000.xhp
index 5528a6bf9a..5528a6bf9a 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/05040000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05040000.xhp
diff --git a/helpcontent2/source/text/shared/explorer/database/05040100.xhp b/helpcontent2/source/text/shared/explorer/database/05040100.xhp
index a603258de7..a603258de7 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/05040100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05040100.xhp
diff --git a/helpcontent2/source/text/shared/explorer/database/05040200.xhp b/helpcontent2/source/text/shared/explorer/database/05040200.xhp
index c4c54c110a..c4c54c110a 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/05040200.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05040200.xhp
diff --git a/helpcontent2/source/text/shared/explorer/database/11030100.xhp b/helpcontent2/source/text/shared/explorer/database/11030100.xhp
index 733522a0ce..733522a0ce 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/11030100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11030100.xhp
diff --git a/helpcontent2/source/text/shared/explorer/database/11170000.xhp b/helpcontent2/source/text/shared/explorer/database/11170000.xhp
index f05730913c..f05730913c 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/11170000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11170000.xhp
diff --git a/helpcontent2/source/text/shared/explorer/database/11170100.xhp b/helpcontent2/source/text/shared/explorer/database/11170100.xhp
index f8df2f7319..f8df2f7319 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/11170100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11170100.xhp
diff --git a/helpcontent2/source/text/shared/explorer/database/dabaadvprop.xhp b/helpcontent2/source/text/shared/explorer/database/dabaadvprop.xhp
index b10574c408..b10574c408 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/dabaadvprop.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabaadvprop.xhp
diff --git a/helpcontent2/source/text/shared/explorer/database/dabaadvpropgen.xhp b/helpcontent2/source/text/shared/explorer/database/dabaadvpropgen.xhp
index 990c8691c4..990c8691c4 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/dabaadvpropgen.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabaadvpropgen.xhp
diff --git a/helpcontent2/source/text/shared/explorer/database/dabadoc.xhp b/helpcontent2/source/text/shared/explorer/database/dabadoc.xhp
index 712665e3a8..712665e3a8 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/dabadoc.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabadoc.xhp
diff --git a/helpcontent2/source/text/shared/explorer/database/dabaprop.xhp b/helpcontent2/source/text/shared/explorer/database/dabaprop.xhp
index 6365b365c5..6365b365c5 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/dabaprop.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabaprop.xhp
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz03auth.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz03auth.xhp
index a745063c56..a745063c56 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz03auth.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz03auth.xhp
diff --git a/helpcontent2/source/text/shared/explorer/database/main.xhp b/helpcontent2/source/text/shared/explorer/database/main.xhp
index bde780c01b..bde780c01b 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/main.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/main.xhp
diff --git a/helpcontent2/source/text/shared/explorer/database/menubar.xhp b/helpcontent2/source/text/shared/explorer/database/menubar.xhp
index d1579ddc61..d1579ddc61 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/menubar.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/menubar.xhp
diff --git a/helpcontent2/source/text/shared/explorer/database/menufile.xhp b/helpcontent2/source/text/shared/explorer/database/menufile.xhp
index c5741c79ee..c5741c79ee 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/menufile.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/menufile.xhp
diff --git a/helpcontent2/source/text/shared/explorer/database/menuview.xhp b/helpcontent2/source/text/shared/explorer/database/menuview.xhp
index bbfa747913..bbfa747913 100755..100644
--- a/helpcontent2/source/text/shared/explorer/database/menuview.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/menuview.xhp
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_main.xhp b/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
index 75e98c6bd6..a8263c63a3 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
@@ -154,7 +154,7 @@
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3059785" role="paragraph" l10n="NEW">You can also insert text that should be the same on every page of the report. Click the Label Field icon
-<image id="img_id5605334" src="res/commandimagelist/sc_label.png" width="0.566cm" height="0.566cm" localize="true"><alt xml-lang="en-US" id="alt_id5605334">Icon</alt>
+<image id="img_id5605334" src="cmd/sc_label.png" width="0.566cm" height="0.566cm" localize="true"><alt xml-lang="en-US" id="alt_id5605334">Icon</alt>
 	</image>, then drag a rectangle in the Page Header or Page Footer area. Edit the Label property to show the text you want.</paragraph>
          </listitem>
       </list><comment>Align at Section toolbar</comment>
@@ -189,7 +189,7 @@
       <list type="ordered">
          <listitem>
             <paragraph xml-lang="en-US" id="par_id8286385" role="paragraph" l10n="NEW">Click the Execute Report icon
-<image id="img_id3380230" src="res/commandimagelist/sc_executereport.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id3380230">Icon</alt>
+<image id="img_id3380230" src="cmd/sc_executereport.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id3380230">Icon</alt>
 	</image> on the toolbar.</paragraph>
          </listitem>
       </list>
@@ -198,12 +198,12 @@
       <paragraph xml-lang="en-US" id="hd_id8746910" role="heading" level="2" l10n="NEW">To edit a report</paragraph>
       <paragraph xml-lang="en-US" id="par_id9636524" role="paragraph" l10n="NEW">First decide if you want to edit the generated report, which is a static Writer document, or if you want to edit the Report Builder view and then generate a new report based on the new design.</paragraph>
       <paragraph xml-lang="en-US" id="par_id5941648" role="paragraph" l10n="NEW">The Writer document is opened read-only. To edit the Writer document, click Edit File
-<image id="img_id8237556" src="res/commandimagelist/sc_editdoc.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id8237556">Icon</alt>
+<image id="img_id8237556" src="cmd/sc_editdoc.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id8237556">Icon</alt>
 	</image> on the Standard toolbar.<comment>saved automatically with the Base file?</comment></paragraph>
       <paragraph xml-lang="en-US" id="par_id8307138" role="paragraph" l10n="CHG">If you want to edit the Report Builder view, you can change some of its properties.</paragraph>
       <paragraph xml-lang="en-US" id="par_id7138889" role="paragraph" l10n="NEW">Click in the Details area. Then in the Properties window, change some properties, for example the background color.</paragraph>
       <paragraph xml-lang="en-US" id="par_id9869380" role="paragraph" l10n="NEW">After finishing, click the Execute Report icon
-<image id="Graphic2" src="res/commandimagelist/sc_executereport.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_">Icon</alt>
+<image id="Graphic2" src="cmd/sc_executereport.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_">Icon</alt>
 	</image> to create a new report.</paragraph>
       <paragraph xml-lang="en-US" id="par_id12512" role="paragraph" l10n="NEW">If you close the Report Builder, you will be asked if the report should be saved. Click Yes, give the report a name, and click OK.<comment>report part of Base file?</comment></paragraph>
       <paragraph xml-lang="en-US" id="par_id2676168" role="heading" level="2" l10n="NEW">Sorting the report</paragraph>
@@ -211,7 +211,7 @@
       <list type="ordered">
          <listitem>
             <paragraph xml-lang="en-US" id="par_id1743827" role="paragraph" l10n="NEW">Open the Report Builder view and click the Sorting and Grouping icon
-<image id="img_id9557786" src="res/commandimagelist/sc_dbsortingandgrouping.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id9557786">Icon</alt>
+<image id="img_id9557786" src="cmd/sc_dbsortingandgrouping.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id9557786">Icon</alt>
 	</image> on the toolbar. You see the <link href="text/shared/explorer/database/rep_sort.xhp">Sorting and Grouping</link> dialog.</paragraph>
          </listitem>
          <listitem>
@@ -225,7 +225,7 @@
       <list type="ordered">
          <listitem>
             <paragraph xml-lang="en-US" id="par_id399182" role="paragraph" l10n="NEW">Open the Report Builder view and click the Sorting and Grouping icon
-<image id="Graphic21" src="res/commandimagelist/sc_dbsortingandgrouping.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_">Icon</alt>
+<image id="Graphic21" src="cmd/sc_dbsortingandgrouping.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_">Icon</alt>
 	</image> on the toolbar. You see the <link href="text/shared/explorer/database/rep_sort.xhp">Sorting and Grouping</link> dialog.</paragraph>
          </listitem>
          <listitem>
@@ -233,7 +233,7 @@
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id95828" role="paragraph" l10n="NEW">Click the Add Field icon
-<image id="Graphic3" src="res/commandimagelist/sc_addfield.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_">Icon</alt>
+<image id="Graphic3" src="cmd/sc_addfield.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_">Icon</alt>
 	</image> to open the Add Field window.</paragraph>
          </listitem>
          <listitem>
diff --git a/helpcontent2/source/text/shared/guide/aaa_start.xhp b/helpcontent2/source/text/shared/guide/aaa_start.xhp
index 14126e9352..14126e9352 100755..100644
--- a/helpcontent2/source/text/shared/guide/aaa_start.xhp
+++ b/helpcontent2/source/text/shared/guide/aaa_start.xhp
diff --git a/helpcontent2/source/text/shared/guide/active_help_on_off.xhp b/helpcontent2/source/text/shared/guide/active_help_on_off.xhp
index 3ca6aba2ea..3ca6aba2ea 100755..100644
--- a/helpcontent2/source/text/shared/guide/active_help_on_off.xhp
+++ b/helpcontent2/source/text/shared/guide/active_help_on_off.xhp
diff --git a/helpcontent2/source/text/shared/guide/activex.xhp b/helpcontent2/source/text/shared/guide/activex.xhp
index 2227463043..2227463043 100755..100644
--- a/helpcontent2/source/text/shared/guide/activex.xhp
+++ b/helpcontent2/source/text/shared/guide/activex.xhp
diff --git a/helpcontent2/source/text/shared/guide/autocorr_url.xhp b/helpcontent2/source/text/shared/guide/autocorr_url.xhp
index a59255c60b..393a5745c2 100755..100644
--- a/helpcontent2/source/text/shared/guide/autocorr_url.xhp
+++ b/helpcontent2/source/text/shared/guide/autocorr_url.xhp
@@ -57,7 +57,7 @@
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z to undo this formatting.</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3149235" role="listitem" l10n="CHG" oldref="4">If you do not notice this conversion until later, select the hyperlink and choose the menu command <emph>Format - Default Formatting</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3149235" role="listitem" l10n="CHG" oldref="4">If you do not notice this conversion until later, select the hyperlink, open the context menu and choose <emph>Remove Hyperlink</emph>.</paragraph>
          </listitem>
       </list>
       <paragraph xml-lang="en-US" id="hd_id3152350" role="heading" level="2" l10n="U" oldref="9">Turn off URL Recognition</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/background.xhp b/helpcontent2/source/text/shared/guide/background.xhp
index 927f8b3b72..927f8b3b72 100755..100644
--- a/helpcontent2/source/text/shared/guide/background.xhp
+++ b/helpcontent2/source/text/shared/guide/background.xhp
diff --git a/helpcontent2/source/text/shared/guide/border_paragraph.xhp b/helpcontent2/source/text/shared/guide/border_paragraph.xhp
index 3566abf3ce..3566abf3ce 100755..100644
--- a/helpcontent2/source/text/shared/guide/border_paragraph.xhp
+++ b/helpcontent2/source/text/shared/guide/border_paragraph.xhp
diff --git a/helpcontent2/source/text/shared/guide/border_table.xhp b/helpcontent2/source/text/shared/guide/border_table.xhp
index 4455968b8e..4455968b8e 100755..100644
--- a/helpcontent2/source/text/shared/guide/border_table.xhp
+++ b/helpcontent2/source/text/shared/guide/border_table.xhp
diff --git a/helpcontent2/source/text/shared/guide/breaking_lines.xhp b/helpcontent2/source/text/shared/guide/breaking_lines.xhp
index 6a896e43fc..6a896e43fc 100755..100644
--- a/helpcontent2/source/text/shared/guide/breaking_lines.xhp
+++ b/helpcontent2/source/text/shared/guide/breaking_lines.xhp
diff --git a/helpcontent2/source/text/shared/guide/chart_axis.xhp b/helpcontent2/source/text/shared/guide/chart_axis.xhp
index 2a8d55eea5..2a8d55eea5 100755..100644
--- a/helpcontent2/source/text/shared/guide/chart_axis.xhp
+++ b/helpcontent2/source/text/shared/guide/chart_axis.xhp
diff --git a/helpcontent2/source/text/shared/guide/chart_barformat.xhp b/helpcontent2/source/text/shared/guide/chart_barformat.xhp
index bdc5f5746e..bdc5f5746e 100755..100644
--- a/helpcontent2/source/text/shared/guide/chart_barformat.xhp
+++ b/helpcontent2/source/text/shared/guide/chart_barformat.xhp
diff --git a/helpcontent2/source/text/shared/guide/chart_title.xhp b/helpcontent2/source/text/shared/guide/chart_title.xhp
index 7b4c54a9b1..7b4c54a9b1 100755..100644
--- a/helpcontent2/source/text/shared/guide/chart_title.xhp
+++ b/helpcontent2/source/text/shared/guide/chart_title.xhp
diff --git a/helpcontent2/source/text/shared/guide/configure_overview.xhp b/helpcontent2/source/text/shared/guide/configure_overview.xhp
index 0bf4e119f8..0bf4e119f8 100755..100644
--- a/helpcontent2/source/text/shared/guide/configure_overview.xhp
+++ b/helpcontent2/source/text/shared/guide/configure_overview.xhp
diff --git a/helpcontent2/source/text/shared/guide/contextmenu.xhp b/helpcontent2/source/text/shared/guide/contextmenu.xhp
index b096269f71..b096269f71 100755..100644
--- a/helpcontent2/source/text/shared/guide/contextmenu.xhp
+++ b/helpcontent2/source/text/shared/guide/contextmenu.xhp
diff --git a/helpcontent2/source/text/shared/guide/copy_drawfunctions.xhp b/helpcontent2/source/text/shared/guide/copy_drawfunctions.xhp
index 9098756ad3..a3b028cbf1 100644
--- a/helpcontent2/source/text/shared/guide/copy_drawfunctions.xhp
+++ b/helpcontent2/source/text/shared/guide/copy_drawfunctions.xhp
@@ -66,7 +66,7 @@
 <paragraph role="paragraph" id="par_id3150276" xml-lang="en-US" l10n="CHG" oldref="35">An inserted drawing object is anchored to the current paragraph. You can change the anchor by selecting the object and clicking the <emph>Change Anchor</emph> icon on the <emph>OLE-Object</emph> toolbar or the <emph>Frame</emph> toolbar. This opens a popup menu where you can select the anchor type.</paragraph>
 <paragraph role="heading" id="hd_id3145609" xml-lang="en-US" level="2" l10n="U" oldref="36">Inserting into a spreadsheet</paragraph>
 <paragraph role="paragraph" id="par_id3151210" xml-lang="en-US" l10n="CHG" oldref="30">An inserted drawing object is anchored to the current cell. You can change the anchor between cell and page by selecting the object and clicking the <emph>Change Anchor</emph> icon 
-<image id="img_id3149456" src="res/commandimagelist/sc_toggleanchortype.png" width="5.64mm" height="5.64mm"><alt id="alt_id3149456" xml-lang="en-US">Icon</alt>
+<image id="img_id3149456" src="cmd/sc_toggleanchortype.png" width="5.64mm" height="5.64mm"><alt id="alt_id3149456" xml-lang="en-US">Icon</alt>
 	</image>.</paragraph>
 <section id="relatedtopics">
 <embed href="text/shared/guide/copytable2application.xhp#copytable2application"/>
diff --git a/helpcontent2/source/text/shared/guide/copytable2application.xhp b/helpcontent2/source/text/shared/guide/copytable2application.xhp
index 7a1715a469..7a1715a469 100755..100644
--- a/helpcontent2/source/text/shared/guide/copytable2application.xhp
+++ b/helpcontent2/source/text/shared/guide/copytable2application.xhp
diff --git a/helpcontent2/source/text/shared/guide/copytext2application.xhp b/helpcontent2/source/text/shared/guide/copytext2application.xhp
index feaff89db2..2cf335fd5d 100644
--- a/helpcontent2/source/text/shared/guide/copytext2application.xhp
+++ b/helpcontent2/source/text/shared/guide/copytext2application.xhp
@@ -63,7 +63,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="E">
-<image id="img_id3143270" src="res/commandimagelist/sc_paste.png" width="5.64mm" height="5.64mm"><alt id="alt_id3143270" xml-lang="en-US">Icon</alt>
+<image id="img_id3143270" src="cmd/sc_paste.png" width="5.64mm" height="5.64mm"><alt id="alt_id3143270" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/guide/ctl.xhp b/helpcontent2/source/text/shared/guide/ctl.xhp
index fc83807b1f..fc83807b1f 100755..100644
--- a/helpcontent2/source/text/shared/guide/ctl.xhp
+++ b/helpcontent2/source/text/shared/guide/ctl.xhp
diff --git a/helpcontent2/source/text/shared/guide/data_addressbook.xhp b/helpcontent2/source/text/shared/guide/data_addressbook.xhp
index 5a812d6cb5..5a812d6cb5 100755..100644
--- a/helpcontent2/source/text/shared/guide/data_addressbook.xhp
+++ b/helpcontent2/source/text/shared/guide/data_addressbook.xhp
diff --git a/helpcontent2/source/text/shared/guide/data_dbase2office.xhp b/helpcontent2/source/text/shared/guide/data_dbase2office.xhp
index bd129a0482..bd129a0482 100755..100644
--- a/helpcontent2/source/text/shared/guide/data_dbase2office.xhp
+++ b/helpcontent2/source/text/shared/guide/data_dbase2office.xhp
diff --git a/helpcontent2/source/text/shared/guide/data_enter_sql.xhp b/helpcontent2/source/text/shared/guide/data_enter_sql.xhp
index 9809e47ae8..b3e3262bd5 100644
--- a/helpcontent2/source/text/shared/guide/data_enter_sql.xhp
+++ b/helpcontent2/source/text/shared/guide/data_enter_sql.xhp
@@ -58,10 +58,10 @@
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3151176" role="paragraph" l10n="U" oldref="91">Click the <emph>Create Query in SQL View</emph> icon 
-<image id="img_id3154071" src="res/commandimagelist/sc_dbnewquerysql.png" width="0.1862in" height="0.1862in"><alt xml-lang="en-US" id="alt_id3154071">Icon</alt>
+<image id="img_id3154071" src="cmd/sc_dbnewquerysql.png" width="0.1862in" height="0.1862in"><alt xml-lang="en-US" id="alt_id3154071">Icon</alt>
 	</image> or</paragraph>
             <paragraph xml-lang="en-US" id="par_id3145786" role="paragraph" l10n="U" oldref="92">Select an existing query from the list and click the <emph>Edit</emph> icon 
-<image id="img_id3156212" src="res/commandimagelist/sc_dbqueryedit.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3156212">Icon</alt>
+<image id="img_id3156212" src="cmd/sc_dbqueryedit.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3156212">Icon</alt>
 	</image>.</paragraph>
          </listitem>
          <listitem>
@@ -69,12 +69,12 @@
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3152460" role="paragraph" l10n="U" oldref="96">Click the <emph>Run</emph> icon 
-<image id="img_id3152886" src="res/commandimagelist/sc_sbanativesql.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3152886">Icon</alt>
+<image id="img_id3152886" src="cmd/sc_sbanativesql.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3152886">Icon</alt>
 	</image>. The result of the query is displayed in the upper window.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3149298" role="paragraph" l10n="U" oldref="98">Click the <emph>Save</emph> or <emph>Save As</emph> icon 
-<image id="img_id3153159" src="res/commandimagelist/sc_save.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3153159">Icon</alt>
+<image id="img_id3153159" src="cmd/sc_save.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3153159">Icon</alt>
 	</image> to save the query.</paragraph>
          </listitem>
       </list>
diff --git a/helpcontent2/source/text/shared/guide/data_report.xhp b/helpcontent2/source/text/shared/guide/data_report.xhp
index e325125dc2..e325125dc2 100755..100644
--- a/helpcontent2/source/text/shared/guide/data_report.xhp
+++ b/helpcontent2/source/text/shared/guide/data_report.xhp
diff --git a/helpcontent2/source/text/shared/guide/data_search.xhp b/helpcontent2/source/text/shared/guide/data_search.xhp
index f0a797cdae..e4a88ffbf9 100644
--- a/helpcontent2/source/text/shared/guide/data_search.xhp
+++ b/helpcontent2/source/text/shared/guide/data_search.xhp
@@ -50,7 +50,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="E">
-<image id="img_id3153311" src="res/commandimagelist/sc_recsearch.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153311" xml-lang="en-US">Icon</alt>
+<image id="img_id3153311" src="cmd/sc_recsearch.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153311" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/guide/data_search2.xhp b/helpcontent2/source/text/shared/guide/data_search2.xhp
index bbe855773f..6fc53ea31e 100644
--- a/helpcontent2/source/text/shared/guide/data_search2.xhp
+++ b/helpcontent2/source/text/shared/guide/data_search2.xhp
@@ -57,12 +57,12 @@
 </listitem>
 <listitem>
 <paragraph role="paragraph" id="par_id3150984" xml-lang="en-US" l10n="CHG" oldref="19">On the <emph>Form Controls</emph> toolbar, click the <emph>Design Mode On/Off</emph> icon 
-<image id="img_id3147618" src="res/commandimagelist/sc_switchcontroldesignmode.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147618" xml-lang="en-US">Icon</alt>
+<image id="img_id3147618" src="cmd/sc_switchcontroldesignmode.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147618" xml-lang="en-US">Icon</alt>
 	</image> to turn off the design mode.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="paragraph" id="par_id3148672" xml-lang="en-US" l10n="CHG" oldref="6">On the <emph>Form Navigation</emph> toolbar, click the <emph>Form-Based Filters</emph> icon 
-<image id="img_id3149807" src="res/commandimagelist/sc_formfilter.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149807" xml-lang="en-US">Icon</alt>
+<image id="img_id3149807" src="cmd/sc_formfilter.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149807" xml-lang="en-US">Icon</alt>
 	</image>. The current document is displayed with its form controls as an empty edit mask. The <emph>Form Filter </emph>toolbar appears.</paragraph>
 </listitem>
 <listitem>
@@ -75,10 +75,10 @@
 <bookmark xml-lang="en-US" branch="hid/.uno:FormFilterExit" id="bm_id2865336" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:FormFilterExit" id="bm_id3149959" localize="false"/><paragraph role="paragraph" id="par_id3145273" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid=".uno:FormFilterExit">If you click on the <emph>Close</emph> button on the <emph>Form Filter</emph> toolbar, the form is displayed without a filter.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3150114" xml-lang="en-US" l10n="CHG" oldref="11">Click the <link href="text/shared/02/12120000.xhp" name="Apply Filter"><emph>Apply Filter</emph></link> icon 
-<image id="img_id3144764" src="res/commandimagelist/sc_datafilterstandardfilter.png" width="0.222inch" height="0.222inch"><alt id="alt_id3144764" xml-lang="en-US">Icon</alt>
+<image id="img_id3144764" src="cmd/sc_datafilterstandardfilter.png" width="0.222inch" height="0.222inch"><alt id="alt_id3144764" xml-lang="en-US">Icon</alt>
 	</image> on the <emph>Form Navigation</emph> toolbar to change to the filtered view.</paragraph>
 <paragraph role="paragraph" id="par_id3146898" xml-lang="en-US" l10n="U" oldref="12">The filter that has been set can be removed by clicking <link href="text/shared/02/12040000.xhp" name="Remove Filter/Sort"><emph>Remove Filter/Sort</emph></link> icon 
-<image id="img_id3151318" src="res/commandimagelist/sc_removefiltersort.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151318" xml-lang="en-US">Icon</alt>
+<image id="img_id3151318" src="cmd/sc_removefiltersort.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151318" xml-lang="en-US">Icon</alt>
 	</image>.</paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
 <embed href="text/shared/guide/filternavigator.xhp#filternavigator"/>
diff --git a/helpcontent2/source/text/shared/guide/database_main.xhp b/helpcontent2/source/text/shared/guide/database_main.xhp
index 2039a3175f..2039a3175f 100755..100644
--- a/helpcontent2/source/text/shared/guide/database_main.xhp
+++ b/helpcontent2/source/text/shared/guide/database_main.xhp
diff --git a/helpcontent2/source/text/shared/guide/doc_autosave.xhp b/helpcontent2/source/text/shared/guide/doc_autosave.xhp
index cdea018b30..cdea018b30 100755..100644
--- a/helpcontent2/source/text/shared/guide/doc_autosave.xhp
+++ b/helpcontent2/source/text/shared/guide/doc_autosave.xhp
diff --git a/helpcontent2/source/text/shared/guide/doc_save.xhp b/helpcontent2/source/text/shared/guide/doc_save.xhp
index 19f88f17d3..c249e3f41e 100644
--- a/helpcontent2/source/text/shared/guide/doc_save.xhp
+++ b/helpcontent2/source/text/shared/guide/doc_save.xhp
@@ -60,7 +60,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155450" xml-lang="en-US" l10n="E">
-<image id="img_id3152349" src="res/commandimagelist/sc_save.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152349" xml-lang="en-US">This icon is for tips on how to use the program more effectively.</alt></image></paragraph>
+<image id="img_id3152349" src="cmd/sc_save.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152349" xml-lang="en-US">This icon is for tips on how to use the program more effectively.</alt></image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3148685" xml-lang="en-US" l10n="U" oldref="8">The document is saved under its path and name on the current local data medium or network drive or on the Internet, overwriting any file of the same name.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/dragdrop_fromgallery.xhp b/helpcontent2/source/text/shared/guide/dragdrop_fromgallery.xhp
index 4c793cf502..4c793cf502 100755..100644
--- a/helpcontent2/source/text/shared/guide/dragdrop_fromgallery.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop_fromgallery.xhp
diff --git a/helpcontent2/source/text/shared/guide/dragdrop_gallery.xhp b/helpcontent2/source/text/shared/guide/dragdrop_gallery.xhp
index c795bf2f61..c795bf2f61 100755..100644
--- a/helpcontent2/source/text/shared/guide/dragdrop_gallery.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop_gallery.xhp
diff --git a/helpcontent2/source/text/shared/guide/dragdrop_graphic.xhp b/helpcontent2/source/text/shared/guide/dragdrop_graphic.xhp
index c3beacc89d..c3beacc89d 100755..100644
--- a/helpcontent2/source/text/shared/guide/dragdrop_graphic.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop_graphic.xhp
diff --git a/helpcontent2/source/text/shared/guide/dragdrop_table.xhp b/helpcontent2/source/text/shared/guide/dragdrop_table.xhp
index a8ef05a7e0..a8ef05a7e0 100755..100644
--- a/helpcontent2/source/text/shared/guide/dragdrop_table.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop_table.xhp
diff --git a/helpcontent2/source/text/shared/guide/edit_symbolbar.xhp b/helpcontent2/source/text/shared/guide/edit_symbolbar.xhp
index b00ca693e2..b00ca693e2 100755..100644
--- a/helpcontent2/source/text/shared/guide/edit_symbolbar.xhp
+++ b/helpcontent2/source/text/shared/guide/edit_symbolbar.xhp
diff --git a/helpcontent2/source/text/shared/guide/email.xhp b/helpcontent2/source/text/shared/guide/email.xhp
index dcdabf8f5c..dcdabf8f5c 100755..100644
--- a/helpcontent2/source/text/shared/guide/email.xhp
+++ b/helpcontent2/source/text/shared/guide/email.xhp
diff --git a/helpcontent2/source/text/shared/guide/export_ms.xhp b/helpcontent2/source/text/shared/guide/export_ms.xhp
index e9d5e1909e..e9d5e1909e 100755..100644
--- a/helpcontent2/source/text/shared/guide/export_ms.xhp
+++ b/helpcontent2/source/text/shared/guide/export_ms.xhp
diff --git a/helpcontent2/source/text/shared/guide/fax.xhp b/helpcontent2/source/text/shared/guide/fax.xhp
index 30c42f8c56..30c42f8c56 100755..100644
--- a/helpcontent2/source/text/shared/guide/fax.xhp
+++ b/helpcontent2/source/text/shared/guide/fax.xhp
diff --git a/helpcontent2/source/text/shared/guide/flat_icons.xhp b/helpcontent2/source/text/shared/guide/flat_icons.xhp
index c119756122..c119756122 100755..100644
--- a/helpcontent2/source/text/shared/guide/flat_icons.xhp
+++ b/helpcontent2/source/text/shared/guide/flat_icons.xhp
diff --git a/helpcontent2/source/text/shared/guide/fontwork.xhp b/helpcontent2/source/text/shared/guide/fontwork.xhp
index c5dd614fc7..a8836144e0 100644
--- a/helpcontent2/source/text/shared/guide/fontwork.xhp
+++ b/helpcontent2/source/text/shared/guide/fontwork.xhp
@@ -61,7 +61,7 @@
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_idN1069C" role="paragraph" l10n="CHG">On the <emph>Drawing</emph> toolbar or on the <emph>Fontwork</emph> toolbar, click the <emph>Fontwork Gallery</emph> icon.
-<image id="img_id7040009" src="res/commandimagelist/sc_fontworkgalleryfloater.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id7040009">Icon</alt>
+<image id="img_id7040009" src="cmd/sc_fontworkgalleryfloater.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id7040009">Icon</alt>
 	</image></paragraph>
          </listitem>
          <listitem>
diff --git a/helpcontent2/source/text/shared/guide/formfields.xhp b/helpcontent2/source/text/shared/guide/formfields.xhp
index 0dec8b59a3..0dec8b59a3 100755..100644
--- a/helpcontent2/source/text/shared/guide/formfields.xhp
+++ b/helpcontent2/source/text/shared/guide/formfields.xhp
diff --git a/helpcontent2/source/text/shared/guide/gallery_insert.xhp b/helpcontent2/source/text/shared/guide/gallery_insert.xhp
index 42ffad6a96..42ffad6a96 100755..100644
--- a/helpcontent2/source/text/shared/guide/gallery_insert.xhp
+++ b/helpcontent2/source/text/shared/guide/gallery_insert.xhp
diff --git a/helpcontent2/source/text/shared/guide/hyperlink_edit.xhp b/helpcontent2/source/text/shared/guide/hyperlink_edit.xhp
index 9b30ae6c30..7360433d3b 100755..100644
--- a/helpcontent2/source/text/shared/guide/hyperlink_edit.xhp
+++ b/helpcontent2/source/text/shared/guide/hyperlink_edit.xhp
@@ -65,12 +65,7 @@
 <paragraph role="heading" id="hd_id3158432" xml-lang="en-US" level="2" l10n="U" oldref="30">Change the URL of a hyperlink as follows</paragraph>
 <list type="unordered">
 <listitem>
-<paragraph role="listitem" id="par_id3150503" xml-lang="en-US" l10n="CHG" oldref="31">Option 1: As described above, open <link href="text/shared/02/09070000.xhp" name="Hyperlink Dialog">Hyperlink Dialog</link>.</paragraph>
-</listitem>
-</list>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3145119" xml-lang="en-US" l10n="CHG" oldref="32">Option 2: Open <link href="text/shared/main0209.xhp" name="Hyperlink Bar">Hyperlink Bar</link> (<emph>View - Toolbars - Hyperlink Bar</emph>). Click on the hyperlink, do not release the mouse button and drag the hyperlink to the Hyperlink Bar. Edit the URL on the Hyperlink Bar and press the Return key.</paragraph>
+<paragraph role="listitem" id="par_id3150503" xml-lang="en-US" l10n="CHG" oldref="31">As described above, open <link href="text/shared/02/09070000.xhp" name="Hyperlink Dialog">Hyperlink Dialog</link>.</paragraph>
 </listitem>
 </list>
 <paragraph role="heading" id="hd_id3148686" xml-lang="en-US" level="2" l10n="U" oldref="33">Change the attribute of all hyperlinks</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/hyperlink_insert.xhp b/helpcontent2/source/text/shared/guide/hyperlink_insert.xhp
index 086c1678c2..598f34f51f 100644
--- a/helpcontent2/source/text/shared/guide/hyperlink_insert.xhp
+++ b/helpcontent2/source/text/shared/guide/hyperlink_insert.xhp
@@ -64,7 +64,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150275" xml-lang="en-US" l10n="E">
-<image id="img_id3149763" src="res/commandimagelist/sc_hyperlinkdialog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149763" xml-lang="en-US">Icon</alt>
+<image id="img_id3149763" src="cmd/sc_hyperlinkdialog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149763" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/guide/hyperlink_search.xhp b/helpcontent2/source/text/shared/guide/hyperlink_search.xhp
deleted file mode 100755
index d97a2dc8b9..0000000000
--- a/helpcontent2/source/text/shared/guide/hyperlink_search.xhp
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
- *
- * 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.
- *
- ************************************************************************-->
-	
-<helpdocument version="1.0">
-<meta>
-<topic id="textsharedguidehyperlink_searchxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Searching With the Hyperlink Bar</title>
-<filename>/text/shared/guide/hyperlink_search.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-10-19T08:59:12">converted from old format - fpe
-checked - yj</lastedited>
-</history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3150789"><bookmark_value>Internet; starting searches</bookmark_value>
-<bookmark_value>searching;Internet</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3150789" xml-lang="en-US" level="1" l10n="U" oldref="16"><variable id="hyperlink_search"><link href="text/shared/guide/hyperlink_search.xhp" name="Searching With the Hyperlink Bar">Searching With the Hyperlink Bar</link>
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154751" xml-lang="en-US" l10n="CHG" oldref="17">The <emph>Hyperlink</emph> Bar can be used to search for the selected text in the Internet.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_idN10620" xml-lang="en-US" l10n="CHG">Choose <emph>View - Toolbars - Hyperlink Bar</emph> to open the Hyperlink Bar.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3143267" xml-lang="en-US" l10n="U" oldref="18">Enter the text you want to find in the <emph>URL Name</emph> field.</paragraph>
-<paragraph role="listitem" id="par_id3150774" xml-lang="en-US" l10n="CHG" oldref="23">If you select text in your document, the text is automatically entered.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="19">Click the <emph>Find</emph> icon to open a submenu.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148538" xml-lang="en-US" l10n="U" oldref="20">Select your preferred search engine from the list.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3143271" xml-lang="en-US" l10n="CHG" oldref="21">$[officename] opens your Web Browser, which calls the selected Internet search engine. After a short time you see the result of your search on screen.</paragraph>
-<paragraph role="tip" id="par_idN10657" xml-lang="en-US" l10n="NEW">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01020200.xhp" name="Search function in the Hyperlink Bar">Internet - Search</link></emph> to define the search options.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="24"><link href="text/shared/main0209.xhp" name="Hyperlink Bar">Hyperlink Bar</link></paragraph>
-</body>
-</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/imagemap.xhp b/helpcontent2/source/text/shared/guide/imagemap.xhp
index b4a3f896e1..b4a3f896e1 100755..100644
--- a/helpcontent2/source/text/shared/guide/imagemap.xhp
+++ b/helpcontent2/source/text/shared/guide/imagemap.xhp
diff --git a/helpcontent2/source/text/shared/guide/import_ms.xhp b/helpcontent2/source/text/shared/guide/import_ms.xhp
index ae56c248b3..ae56c248b3 100755..100644
--- a/helpcontent2/source/text/shared/guide/import_ms.xhp
+++ b/helpcontent2/source/text/shared/guide/import_ms.xhp
diff --git a/helpcontent2/source/text/shared/guide/integratinguno.xhp b/helpcontent2/source/text/shared/guide/integratinguno.xhp
index 426c22d62b..426c22d62b 100755..100644
--- a/helpcontent2/source/text/shared/guide/integratinguno.xhp
+++ b/helpcontent2/source/text/shared/guide/integratinguno.xhp
diff --git a/helpcontent2/source/text/shared/guide/labels.xhp b/helpcontent2/source/text/shared/guide/labels.xhp
index 3e343e0c0f..3e343e0c0f 100755..100644
--- a/helpcontent2/source/text/shared/guide/labels.xhp
+++ b/helpcontent2/source/text/shared/guide/labels.xhp
diff --git a/helpcontent2/source/text/shared/guide/language_select.xhp b/helpcontent2/source/text/shared/guide/language_select.xhp
index bdccb0a0cc..5f16804f5a 100755..100644
--- a/helpcontent2/source/text/shared/guide/language_select.xhp
+++ b/helpcontent2/source/text/shared/guide/language_select.xhp
@@ -154,16 +154,38 @@
             <paragraph xml-lang="en-US" id="par_id121158" role="paragraph" l10n="NEW">Select another UI language in the "User interface" listbox.</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3806878" role="paragraph" l10n="NEW">Click OK and restart the OpenOffice.org software.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3806878" role="paragraph" l10n="NEW">Click OK and restart the %PRODUCTNAME software.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id130619" role="paragraph" l10n="NEW">If the listbox doesn't list the language that you want, see "Adding More UI Languages".</paragraph>
          </listitem>
       </list>
       <paragraph xml-lang="en-US" id="hd_id9999694" role="heading" level="2" l10n="NEW">Adding More UI Languages</paragraph>
+      <switch select="sys">
+      <case select="WIN">
       <list type="ordered">
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id2216559" role="paragraph" l10n="NEW">Open your Web browser and enter <link href="http://wiki.services.openoffice.org/wiki/Download_OpenOffice.org_LanguagePacks">http://wiki.services.openoffice.org/wiki/Download_OpenOffice.org_LanguagePacks</link></paragraph>
+            <paragraph xml-lang="en-US" id="par_id9852901" role="paragraph" l10n="CHG">Close %PRODUCTNAME software (also close the Quickstarter, if you enabled it).</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3791925" role="paragraph" l10n="NEW">Run %PRODUCTNAME installer, choose Modify, then select the language that you would like to install from the Additional user interface languages group.</paragraph>
+         </listitem>
+      </list>
+      </case>
+      <case select="UNIX">
+      <paragraph xml-lang="en-US" id="par_id9852903" role="paragraph" l10n="CHG">If you use %PRODUCTNAME packages maintaned by your Linux distribution, follow the steps below.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id9852902" role="paragraph" l10n="CHG">Close %PRODUCTNAME software (also close the Quickstarter, if you enabled it).</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3791926" role="paragraph" l10n="NEW">Open your favourite package manager, look for %PRODUCTNAME language packs, and install the languages that you would like to use.</paragraph>
+         </listitem>
+      </list>
+      <paragraph xml-lang="en-US" id="par_id9852904" role="paragraph" l10n="CHG">If you downloaded %PRODUCTNAME packages from the main %PRODUCTNAME Web site, follow the steps below.</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id2216559" role="paragraph" l10n="NEW">Open your Web browser and enter <link href="http://www.libreoffice.org/download/">http://www.libreoffice.org/download/</link></paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id7869502" role="paragraph" l10n="CHG">Select and download the correct language pack for your version of %PRODUCTNAME software.</paragraph>
@@ -172,11 +194,29 @@
             <paragraph xml-lang="en-US" id="par_id9852900" role="paragraph" l10n="CHG">Close %PRODUCTNAME software (also close the Quickstarter, if you enabled it).</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3791924" role="paragraph" l10n="NEW">Install the language pack. Either double-click the exe file, or unpack the tar.gz file according to standard practice on your platform.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3791924" role="paragraph" l10n="NEW">Install the language pack. Unpack tar.gz file and install the packages according to standard practice on your platform.</paragraph>
+         </listitem>
+      </list>
+      </case>
+      <case select="MAC">
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id221655a" role="paragraph" l10n="NEW">Open your Web browser and enter <link href="http://www.libreoffice.org/download/">http://www.libreoffice.org/download/</link></paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id7869503" role="paragraph" l10n="CHG">Select and download the correct language pack for your version of %PRODUCTNAME software.</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id9852905" role="paragraph" l10n="CHG">Close %PRODUCTNAME software (also close the Quickstarter, if you enabled it).</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id3791927" role="paragraph" l10n="NEW">Install the language pack by double-clicking the dmg file.</paragraph>
          </listitem>
       </list>
+      </case>
+      </switch>
       <embed href="text/shared/00/00000004.xhp#related"/>
       <paragraph xml-lang="en-US" id="par_id3150043" role="paragraph" l10n="U" oldref="28"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01140000.xhp" name="Language Settings - Languages">Language Settings - Languages</link></paragraph>
       <paragraph xml-lang="en-US" id="par_id3152483" role="paragraph" l10n="U" oldref="29"><link href="text/shared/01/05020100.xhp" name="Format - Character - Font">Format - Character - Font</link></paragraph>
    </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/line_intext.xhp b/helpcontent2/source/text/shared/guide/line_intext.xhp
index b8077e2d27..3ed22958de 100644
--- a/helpcontent2/source/text/shared/guide/line_intext.xhp
+++ b/helpcontent2/source/text/shared/guide/line_intext.xhp
@@ -54,10 +54,10 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3156113" xml-lang="en-US" l10n="E">
-<image id="img_id3166410" src="res/commandimagelist/sc_insertdraw.png" width="0.2228in" height="0.2228in"><alt id="alt_id3166410" xml-lang="en-US">Icon</alt>
+<image id="img_id3166410" src="cmd/sc_insertdraw.png" width="0.2228in" height="0.2228in"><alt id="alt_id3166410" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 <paragraph role="paragraph" id="par_id3152780" xml-lang="en-US" l10n="E">
-<image id="img_id3154285" src="res/commandimagelist/sc_line.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154285" xml-lang="en-US">Icon</alt>
+<image id="img_id3154285" src="cmd/sc_line.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154285" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -80,7 +80,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3149294" xml-lang="en-US" l10n="E">
-<image id="img_id3159413" src="res/commandimagelist/sc_drawselect.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159413" xml-lang="en-US">Icon</alt>
+<image id="img_id3159413" src="cmd/sc_drawselect.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159413" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/shared/guide/lineend_define.xhp b/helpcontent2/source/text/shared/guide/lineend_define.xhp
index 9f700c0f6d..9f700c0f6d 100755..100644
--- a/helpcontent2/source/text/shared/guide/lineend_define.xhp
+++ b/helpcontent2/source/text/shared/guide/lineend_define.xhp
diff --git a/helpcontent2/source/text/shared/guide/linestyle_define.xhp b/helpcontent2/source/text/shared/guide/linestyle_define.xhp
index f1b9ab30ee..f1b9ab30ee 100755..100644
--- a/helpcontent2/source/text/shared/guide/linestyle_define.xhp
+++ b/helpcontent2/source/text/shared/guide/linestyle_define.xhp
diff --git a/helpcontent2/source/text/shared/guide/linestyles.xhp b/helpcontent2/source/text/shared/guide/linestyles.xhp
index 5077669185..793f340186 100644
--- a/helpcontent2/source/text/shared/guide/linestyles.xhp
+++ b/helpcontent2/source/text/shared/guide/linestyles.xhp
@@ -51,12 +51,12 @@
 <list type="unordered">
 <listitem>
 <paragraph role="paragraph" id="par_id3145068" xml-lang="en-US" l10n="CHG" oldref="6">Click the <emph>Line</emph> icon 
-<image id="img_id3144510" src="res/commandimagelist/sc_formatline.png" width="0.222inch" height="0.222inch"><alt id="alt_id3144510" xml-lang="en-US">Icon</alt>
+<image id="img_id3144510" src="cmd/sc_formatline.png" width="0.222inch" height="0.222inch"><alt id="alt_id3144510" xml-lang="en-US">Icon</alt>
 	</image> to open the <emph>Line</emph> dialog.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="paragraph" id="par_idN106D6" xml-lang="en-US" l10n="NEW">Click the <emph>Arrow Styles</emph> icon 
-<image id="img_id5858221" src="res/commandimagelist/sc_lineendstyle.png" width="0.222inch" height="0.222inch"><alt id="alt_id5858221" xml-lang="en-US">Icon</alt>
+<image id="img_id5858221" src="cmd/sc_lineendstyle.png" width="0.222inch" height="0.222inch"><alt id="alt_id5858221" xml-lang="en-US">Icon</alt>
 	</image> to select an arrow style for the right and left ends of a line.</paragraph>
 </listitem>
 <listitem>
diff --git a/helpcontent2/source/text/shared/guide/macro_recording.xhp b/helpcontent2/source/text/shared/guide/macro_recording.xhp
index 433c1b06ed..433c1b06ed 100755..100644
--- a/helpcontent2/source/text/shared/guide/macro_recording.xhp
+++ b/helpcontent2/source/text/shared/guide/macro_recording.xhp
diff --git a/helpcontent2/source/text/shared/guide/main.xhp b/helpcontent2/source/text/shared/guide/main.xhp
index 63189316da..aac55d19cd 100755..100644
--- a/helpcontent2/source/text/shared/guide/main.xhp
+++ b/helpcontent2/source/text/shared/guide/main.xhp
@@ -185,7 +185,6 @@
 <embed href="text/shared/guide/background.xhp#background"/>
 <embed href="text/shared/guide/hyperlink_edit.xhp#hyperlink_edit"/>
 <embed href="text/shared/guide/hyperlink_insert.xhp#hyperlink_insert"/>
-<embed href="text/shared/guide/hyperlink_search.xhp#hyperlink_search"/>
 <embed href="text/shared/guide/insert_graphic_drawit.xhp#insert_graphic_drawit"/>
 <embed href="text/shared/guide/language_select.xhp#language_select"/>
 <embed href="text/shared/guide/numbering_stop.xhp#numbering_stop"/>
diff --git a/helpcontent2/source/text/shared/guide/makefile.mk b/helpcontent2/source/text/shared/guide/makefile.mk
index d7c15f231a..9bc4454836 100644
--- a/helpcontent2/source/text/shared/guide/makefile.mk
+++ b/helpcontent2/source/text/shared/guide/makefile.mk
@@ -112,7 +112,6 @@ XHPFILES = \
    hyperlink_edit.xhp \
    hyperlink_insert.xhp \
    hyperlink_rel_abs.xhp \
-   hyperlink_search.xhp \
    imagemap.xhp \
    import_ms.xhp \
    insert_bitmap.xhp \
diff --git a/helpcontent2/source/text/shared/guide/measurement_units.xhp b/helpcontent2/source/text/shared/guide/measurement_units.xhp
index 3c120e58e1..3c120e58e1 100755..100644
--- a/helpcontent2/source/text/shared/guide/measurement_units.xhp
+++ b/helpcontent2/source/text/shared/guide/measurement_units.xhp
diff --git a/helpcontent2/source/text/shared/guide/microsoft_terms.xhp b/helpcontent2/source/text/shared/guide/microsoft_terms.xhp
index 8f07bcad9b..bf35d6d92a 100755..100644
--- a/helpcontent2/source/text/shared/guide/microsoft_terms.xhp
+++ b/helpcontent2/source/text/shared/guide/microsoft_terms.xhp
@@ -65,7 +65,7 @@
 <paragraph role="tablecontent" id="par_id3157910" xml-lang="en-US" l10n="U" oldref="6">Change Case</paragraph>
 </tablecell>
 <tablecell>
-<paragraph role="tablecontent" id="par_id3153825" xml-lang="en-US" l10n="U" oldref="7"><link href="text/shared/01/05050000.xhp" name="Case/Characters">Case/Characters</link></paragraph>
+<paragraph role="tablecontent" id="par_id3153825" xml-lang="en-US" l10n="U" oldref="7"><link href="text/shared/01/05050000.xhp" name="~Change Case">Case/Characters</link></paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
diff --git a/helpcontent2/source/text/shared/guide/ms_doctypes.xhp b/helpcontent2/source/text/shared/guide/ms_doctypes.xhp
index 8bd6fd0ce7..8bd6fd0ce7 100755..100644
--- a/helpcontent2/source/text/shared/guide/ms_doctypes.xhp
+++ b/helpcontent2/source/text/shared/guide/ms_doctypes.xhp
diff --git a/helpcontent2/source/text/shared/guide/ms_user.xhp b/helpcontent2/source/text/shared/guide/ms_user.xhp
index 4be6b989a0..4be6b989a0 100755..100644
--- a/helpcontent2/source/text/shared/guide/ms_user.xhp
+++ b/helpcontent2/source/text/shared/guide/ms_user.xhp
diff --git a/helpcontent2/source/text/shared/guide/navigator.xhp b/helpcontent2/source/text/shared/guide/navigator.xhp
index 252bc73afd..252bc73afd 100755..100644
--- a/helpcontent2/source/text/shared/guide/navigator.xhp
+++ b/helpcontent2/source/text/shared/guide/navigator.xhp
diff --git a/helpcontent2/source/text/shared/guide/numbering_stop.xhp b/helpcontent2/source/text/shared/guide/numbering_stop.xhp
index 28d5719ec6..04cb26ef0b 100644
--- a/helpcontent2/source/text/shared/guide/numbering_stop.xhp
+++ b/helpcontent2/source/text/shared/guide/numbering_stop.xhp
@@ -58,10 +58,10 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3154288" role="paragraph" l10n="E">
-<image id="img_id3153527" src="res/commandimagelist/sc_removebullets.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3153527">Icon</alt>
+<image id="img_id3153527" src="cmd/sc_removebullets.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3153527">Icon</alt>
 	</image></paragraph>
                <paragraph xml-lang="en-US" id="par_id3150443" role="paragraph" l10n="E">
-<image id="img_id3163802" src="res/commandimagelist/sc_defaultbullet.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3163802">Icon</alt>
+<image id="img_id3163802" src="cmd/sc_defaultbullet.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3163802">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
@@ -76,7 +76,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3155449" role="paragraph" l10n="E">
-<image id="img_id3158432" src="res/commandimagelist/sc_defaultbullet.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3158432">Icon</alt>
+<image id="img_id3158432" src="cmd/sc_defaultbullet.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3158432">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
diff --git a/helpcontent2/source/text/shared/guide/pageformat_max.xhp b/helpcontent2/source/text/shared/guide/pageformat_max.xhp
index bca3d7b1d9..bca3d7b1d9 100755..100644
--- a/helpcontent2/source/text/shared/guide/pageformat_max.xhp
+++ b/helpcontent2/source/text/shared/guide/pageformat_max.xhp
diff --git a/helpcontent2/source/text/shared/guide/paintbrush.xhp b/helpcontent2/source/text/shared/guide/paintbrush.xhp
index 7acfd8101a..fbe064b368 100755..100644
--- a/helpcontent2/source/text/shared/guide/paintbrush.xhp
+++ b/helpcontent2/source/text/shared/guide/paintbrush.xhp
@@ -59,7 +59,7 @@
             <paragraph xml-lang="en-US" id="par_idN10667" role="paragraph" l10n="NEW">On the <emph>Standard Bar</emph>, click the <emph>Format Paintbrush</emph> icon.</paragraph>
             <paragraph xml-lang="en-US" id="par_idN10660" role="paragraph" l10n="NEW">The cursor changes to a paint bucket.</paragraph>
             <paragraph xml-lang="en-US" id="par_idN10663" role="tip" l10n="CHG">If you want to apply the formatting to more than one selection, double-click the <emph>Format Paintbrush</emph> icon
-<image id="img_id209967" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id209967">Icon</alt>
+<image id="img_id209967" src="cmd/sc_formatpaintbrush.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id209967">Icon</alt>
 	</image>. After you apply all the formatting, click the icon again.</paragraph>
          </listitem>
          <listitem>
diff --git a/helpcontent2/source/text/shared/guide/pasting.xhp b/helpcontent2/source/text/shared/guide/pasting.xhp
index e8b8719002..e8b8719002 100755..100644
--- a/helpcontent2/source/text/shared/guide/pasting.xhp
+++ b/helpcontent2/source/text/shared/guide/pasting.xhp
diff --git a/helpcontent2/source/text/shared/guide/print_blackwhite.xhp b/helpcontent2/source/text/shared/guide/print_blackwhite.xhp
index dc3b8e2eab..dc3b8e2eab 100755..100644
--- a/helpcontent2/source/text/shared/guide/print_blackwhite.xhp
+++ b/helpcontent2/source/text/shared/guide/print_blackwhite.xhp
diff --git a/helpcontent2/source/text/shared/guide/print_faster.xhp b/helpcontent2/source/text/shared/guide/print_faster.xhp
index 7701f5976c..7701f5976c 100755..100644
--- a/helpcontent2/source/text/shared/guide/print_faster.xhp
+++ b/helpcontent2/source/text/shared/guide/print_faster.xhp
diff --git a/helpcontent2/source/text/shared/guide/redlining.xhp b/helpcontent2/source/text/shared/guide/redlining.xhp
index eef290f303..eef290f303 100755..100644
--- a/helpcontent2/source/text/shared/guide/redlining.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining.xhp
diff --git a/helpcontent2/source/text/shared/guide/redlining_accept.xhp b/helpcontent2/source/text/shared/guide/redlining_accept.xhp
index 64129ac46e..64129ac46e 100755..100644
--- a/helpcontent2/source/text/shared/guide/redlining_accept.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining_accept.xhp
diff --git a/helpcontent2/source/text/shared/guide/redlining_doccompare.xhp b/helpcontent2/source/text/shared/guide/redlining_doccompare.xhp
index 665e2d72da..665e2d72da 100755..100644
--- a/helpcontent2/source/text/shared/guide/redlining_doccompare.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining_doccompare.xhp
diff --git a/helpcontent2/source/text/shared/guide/redlining_docmerge.xhp b/helpcontent2/source/text/shared/guide/redlining_docmerge.xhp
index d275d18a14..d275d18a14 100755..100644
--- a/helpcontent2/source/text/shared/guide/redlining_docmerge.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining_docmerge.xhp
diff --git a/helpcontent2/source/text/shared/guide/redlining_enter.xhp b/helpcontent2/source/text/shared/guide/redlining_enter.xhp
index 112094d568..112094d568 100755..100644
--- a/helpcontent2/source/text/shared/guide/redlining_enter.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining_enter.xhp
diff --git a/helpcontent2/source/text/shared/guide/redlining_protect.xhp b/helpcontent2/source/text/shared/guide/redlining_protect.xhp
index b38bc5ea64..b38bc5ea64 100755..100644
--- a/helpcontent2/source/text/shared/guide/redlining_protect.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining_protect.xhp
diff --git a/helpcontent2/source/text/shared/guide/redlining_versions.xhp b/helpcontent2/source/text/shared/guide/redlining_versions.xhp
index fe8fdaff61..fe8fdaff61 100755..100644
--- a/helpcontent2/source/text/shared/guide/redlining_versions.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining_versions.xhp
diff --git a/helpcontent2/source/text/shared/guide/scripting.xhp b/helpcontent2/source/text/shared/guide/scripting.xhp
index 2f4c52037d..2f4c52037d 100755..100644
--- a/helpcontent2/source/text/shared/guide/scripting.xhp
+++ b/helpcontent2/source/text/shared/guide/scripting.xhp
diff --git a/helpcontent2/source/text/shared/guide/space_hyphen.xhp b/helpcontent2/source/text/shared/guide/space_hyphen.xhp
index 943ae48bf2..943ae48bf2 100755..100644
--- a/helpcontent2/source/text/shared/guide/space_hyphen.xhp
+++ b/helpcontent2/source/text/shared/guide/space_hyphen.xhp
diff --git a/helpcontent2/source/text/shared/guide/spadmin.xhp b/helpcontent2/source/text/shared/guide/spadmin.xhp
index 23d61bb1e6..23d61bb1e6 100755..100644
--- a/helpcontent2/source/text/shared/guide/spadmin.xhp
+++ b/helpcontent2/source/text/shared/guide/spadmin.xhp
diff --git a/helpcontent2/source/text/shared/guide/standard_template.xhp b/helpcontent2/source/text/shared/guide/standard_template.xhp
index 0111208f5a..0111208f5a 100755..100644
--- a/helpcontent2/source/text/shared/guide/standard_template.xhp
+++ b/helpcontent2/source/text/shared/guide/standard_template.xhp
diff --git a/helpcontent2/source/text/shared/guide/text_color.xhp b/helpcontent2/source/text/shared/guide/text_color.xhp
index 4ed5b1354f..432f3ab893 100644
--- a/helpcontent2/source/text/shared/guide/text_color.xhp
+++ b/helpcontent2/source/text/shared/guide/text_color.xhp
@@ -51,7 +51,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3156410" role="paragraph" l10n="E">
-<image id="img_id3159233" src="res/commandimagelist/sc_color.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3159233">Icon</alt>
+<image id="img_id3159233" src="cmd/sc_color.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3159233">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
@@ -64,7 +64,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3154897" role="paragraph" l10n="E">
-<image id="img_id3150503" src="res/commandimagelist/sc_fillstyle.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3150503">Icon</alt>
+<image id="img_id3150503" src="cmd/sc_fillstyle.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3150503">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
diff --git a/helpcontent2/source/text/shared/guide/textmode_change.xhp b/helpcontent2/source/text/shared/guide/textmode_change.xhp
index a342635a7f..a342635a7f 100755..100644
--- a/helpcontent2/source/text/shared/guide/textmode_change.xhp
+++ b/helpcontent2/source/text/shared/guide/textmode_change.xhp
diff --git a/helpcontent2/source/text/shared/guide/undo_formatting.xhp b/helpcontent2/source/text/shared/guide/undo_formatting.xhp
index fb9a2761e1..29161fbff5 100644
--- a/helpcontent2/source/text/shared/guide/undo_formatting.xhp
+++ b/helpcontent2/source/text/shared/guide/undo_formatting.xhp
@@ -59,7 +59,7 @@
 <paragraph role="paragraph" id="par_idN1063F" xml-lang="en-US">Press <item type="keycode">Ctrl+A</item> to select the whole text.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_idN10643" xml-lang="en-US">Choose <emph>Format - Default Formatting</emph>.</paragraph>
+<paragraph role="paragraph" id="par_idN10643" xml-lang="en-US">Choose <emph>Format - Clear Direct Formatting</emph>.</paragraph>
 </listitem>
 </list>
 <paragraph role="heading" id="par_idN1064A" xml-lang="en-US" level="2" l10n="CHG">Removing all Direct Formatting in a $[officename] Calc Spreadsheet</paragraph>
@@ -71,7 +71,7 @@
 <paragraph role="paragraph" id="par_idN106DD" xml-lang="en-US">Press <item type="keycode">Ctrl+A</item> to select the whole text.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_idN106F0" xml-lang="en-US">Choose <emph>Format - Default Formatting</emph>.</paragraph>
+<paragraph role="paragraph" id="par_idN106F0" xml-lang="en-US">Choose <emph>Format - Clear Direct Formatting</emph>.</paragraph>
 </listitem>
 </list>
 <paragraph role="heading" id="par_idN1065F" xml-lang="en-US" level="2">Removing all Direct Formatting in a $[officename] Presentation</paragraph>
@@ -83,7 +83,7 @@
 <paragraph role="paragraph" id="par_id3906674" xml-lang="en-US">Press <item type="keycode">Ctrl+A</item> to select the whole text.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_idN1075E" xml-lang="en-US">Choose <emph>Format - Default Formatting</emph>.</paragraph>
+<paragraph role="paragraph" id="par_idN1075E" xml-lang="en-US">Choose <emph>Format - Clear Direct Formatting</emph>.</paragraph>
 </listitem>
 </list>
 <section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/guide/version_number.xhp b/helpcontent2/source/text/shared/guide/version_number.xhp
index 1b7e0b5447..dd35852b09 100755..100644
--- a/helpcontent2/source/text/shared/guide/version_number.xhp
+++ b/helpcontent2/source/text/shared/guide/version_number.xhp
@@ -51,8 +51,7 @@
 <paragraph role="listitem" id="par_id3149346" xml-lang="en-US" l10n="CHG" oldref="5">Choose <emph>Help - About $[officename]</emph>. This opens a dialog containing information about the program.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3147008" xml-lang="en-US" l10n="CHG" oldref="3">To obtain further information, keep holding down <switchinline select="sys"><caseinline select="MAC">the Command key 
-</caseinline><defaultinline>Ctrl </defaultinline></switchinline> and press the letters S D T in succession. At the beginning you will find information about the version and build number. This is followed by a list of contributors. To stop the information before the end, press Esc.</paragraph>
+<paragraph role="listitem" id="par_id3147008" xml-lang="en-US" l10n="CHG" oldref="3"><link href="http://www.libreoffice.org/about-us/credits/">See lists of code and Wiki contributors</link> on the LibreOffice website.</paragraph>
 </listitem>
 </list>
 <embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/shared/guide/viewing_file_properties.xhp b/helpcontent2/source/text/shared/guide/viewing_file_properties.xhp
index 731bb37e68..731bb37e68 100755..100644
--- a/helpcontent2/source/text/shared/guide/viewing_file_properties.xhp
+++ b/helpcontent2/source/text/shared/guide/viewing_file_properties.xhp
diff --git a/helpcontent2/source/text/shared/guide/workfolder.xhp b/helpcontent2/source/text/shared/guide/workfolder.xhp
index a556b5bbc8..a556b5bbc8 100755..100644
--- a/helpcontent2/source/text/shared/guide/workfolder.xhp
+++ b/helpcontent2/source/text/shared/guide/workfolder.xhp
diff --git a/helpcontent2/source/text/shared/guide/xforms.xhp b/helpcontent2/source/text/shared/guide/xforms.xhp
index 515cf7001d..515cf7001d 100755..100644
--- a/helpcontent2/source/text/shared/guide/xforms.xhp
+++ b/helpcontent2/source/text/shared/guide/xforms.xhp
diff --git a/helpcontent2/source/text/shared/guide/xsltfilter.xhp b/helpcontent2/source/text/shared/guide/xsltfilter.xhp
index 7cf2fe6fb4..7cf2fe6fb4 100755..100644
--- a/helpcontent2/source/text/shared/guide/xsltfilter.xhp
+++ b/helpcontent2/source/text/shared/guide/xsltfilter.xhp
diff --git a/helpcontent2/source/text/shared/main0108.xhp b/helpcontent2/source/text/shared/main0108.xhp
index 1fddafc712..6292f8b4b2 100644
--- a/helpcontent2/source/text/shared/main0108.xhp
+++ b/helpcontent2/source/text/shared/main0108.xhp
@@ -52,7 +52,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_idN1064A" xml-lang="en-US" l10n="NEW">
-<image id="img_id1619006" src="res/commandimagelist/sc_helpindex.png" width="0.222inch" height="0.222inch"><alt id="alt_id1619006" xml-lang="en-US">icon</alt></image></paragraph>
+<image id="img_id1619006" src="cmd/sc_helpindex.png" width="0.222inch" height="0.222inch"><alt id="alt_id1619006" xml-lang="en-US">icon</alt></image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_idN10667" xml-lang="en-US" l10n="NEW">%PRODUCTNAME Help</paragraph>
@@ -63,10 +63,10 @@
 <embed href="text/shared/main0201.xhp#whatsthis"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:HelpSupport" id="bm_id3159176" localize="false"/><paragraph role="heading" id="hd_id3154898" xml-lang="en-US" level="2" l10n="U" oldref="15">Support</paragraph>
 <paragraph role="paragraph" id="par_id3157909" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid=".uno:HelpSupport">Shows information on how to get support.</ahelp></paragraph>
-<embed href="text/shared/01/08060100.xhp#registrierung"/>
+<!-- fdo#33468 <embed href="text/shared/01/08060100.xhp#registrierung"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:OnlineUpdate" id="bm_id2785119" localize="false"/><paragraph role="heading" id="hd_id2926419" xml-lang="en-US" level="2" l10n="CHG"><link href="text/shared/01/online_update.xhp">Check for Updates</link></paragraph>
 <paragraph role="paragraph" id="par_id2783898" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Enable an Internet connection for %PRODUCTNAME. If you need a Proxy, check the %PRODUCTNAME Proxy settings in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet. Then choose Check for Updates to check for the availability of a newer version of your office suite.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/service:com.sun.star.tab.tabreg?purchase" id="bm_id584124" localize="false"/><paragraph role="paragraph" id="par_idN106A6" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">This menu command is visible for the evaluation version of %PRODUCTNAME. Choose to open the Purchase %PRODUCTNAME Wizard.</ahelp><comment>UFI: see spec doc "Unlocking_Evalversion_as_Fullversion.sxw" by BH</comment><comment>removed switch, changed to invisible help text</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/service:com.sun.star.tab.tabreg?purchase" id="bm_id584124" localize="false"/><paragraph role="paragraph" id="par_idN106A6" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">This menu command is visible for the evaluation version of %PRODUCTNAME. Choose to open the Purchase %PRODUCTNAME Wizard.</ahelp><comment>UFI: see spec doc "Unlocking_Evalversion_as_Fullversion.sxw" by BH</comment><comment>removed switch, changed to invisible help text</comment></paragraph> -->
 <bookmark xml-lang="en-US" branch="hid/.uno:About" id="bm_id3151385" localize="false"/><paragraph role="heading" id="hd_id3153881" xml-lang="en-US" level="2" l10n="U" oldref="7">About $[officename]</paragraph>
 <paragraph role="paragraph" id="par_id3144510" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid=".uno:About">Displays general program information such as version number and copyrights.</ahelp></paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/shared/main0201.xhp b/helpcontent2/source/text/shared/main0201.xhp
index e4d4dd480c..462a9a6776 100644
--- a/helpcontent2/source/text/shared/main0201.xhp
+++ b/helpcontent2/source/text/shared/main0201.xhp
@@ -149,7 +149,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_idN107D8" xml-lang="en-US" l10n="NEW">
-<image id="img_id3153070" src="res/commandimagelist/sc_zoom.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153070" xml-lang="en-US">Icon</alt>
+<image id="img_id3153070" src="cmd/sc_zoom.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153070" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -168,7 +168,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_idN10855" xml-lang="en-US" l10n="NEW">
-<image id="img_id3174230" src="res/commandimagelist/sc_extendedhelp.png" width="0.222inch" height="0.222inch"><alt id="alt_id3174230" xml-lang="en-US">icon</alt>
+<image id="img_id3174230" src="cmd/sc_extendedhelp.png" width="0.222inch" height="0.222inch"><alt id="alt_id3174230" xml-lang="en-US">icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/main0204.xhp b/helpcontent2/source/text/shared/main0204.xhp
index e34665eb53..e34665eb53 100755..100644
--- a/helpcontent2/source/text/shared/main0204.xhp
+++ b/helpcontent2/source/text/shared/main0204.xhp
diff --git a/helpcontent2/source/text/shared/main0208.xhp b/helpcontent2/source/text/shared/main0208.xhp
index fbf19bfe64..fbf19bfe64 100755..100644
--- a/helpcontent2/source/text/shared/main0208.xhp
+++ b/helpcontent2/source/text/shared/main0208.xhp
diff --git a/helpcontent2/source/text/shared/main0209.xhp b/helpcontent2/source/text/shared/main0209.xhp
deleted file mode 100644
index c88976542a..0000000000
--- a/helpcontent2/source/text/shared/main0209.xhp
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
- *
- * 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.
- *
- ************************************************************************-->
-	
-<helpdocument version="1.0">
-<meta>
-<topic id="textsharedmain0209xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Hyperlink Bar</title>
-<filename>/text/shared/main0209.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-07-14T12:24:35">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="hyperlink">
-<bookmark xml-lang="en-US" branch="hid/SVX_HID_OFA_HYPERLINK_DLG" id="bm_id3155150" localize="false"/>
-<paragraph role="heading" id="hd_id3154094" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/main0209.xhp" name="Hyperlink Bar">Hyperlink Bar</link></paragraph>
-<paragraph role="paragraph" id="par_id3159201" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_OFA_HYPERLINK_DLG">Use the <emph>Hyperlink</emph> Bar to create and edit the hyperlinks in your documents, and to enter criteria for searches using the available Internet search engines.</ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3145136" xml-lang="en-US" l10n="U" oldref="3">You can open and close the <emph>Hyperlink</emph> Bar in <emph>View - Toolbars - Hyperlink Bar</emph>.</paragraph>
-<embed href="text/shared/02/09010000.xhp#namedesurl"/>
-<embed href="text/shared/02/09020000.xhp#sammelbox"/>
-<embed href="text/shared/02/09060000.xhp#frame"/>
-<embed href="text/shared/02/09060000.xhp#syframe"/>
-<embed href="text/shared/02/09030000.xhp#link"/>
-<embed href="text/shared/02/09030000.xhp#sylink"/>
-<embed href="text/shared/02/09050000.xhp#search"/>
-<embed href="text/shared/02/09050000.xhp#sysearch"/>
-</body>
-</helpdocument>
diff --git a/helpcontent2/source/text/shared/main0212.xhp b/helpcontent2/source/text/shared/main0212.xhp
index 9449b97ce8..010e44d2b6 100644
--- a/helpcontent2/source/text/shared/main0212.xhp
+++ b/helpcontent2/source/text/shared/main0212.xhp
@@ -49,7 +49,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3147303" role="paragraph" l10n="E">
-<image id="img_id3153896" src="res/commandimagelist/sc_recsave.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3153896">Icon</alt>
+<image id="img_id3153896" src="cmd/sc_recsave.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3153896">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
@@ -64,7 +64,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3145173" role="paragraph" l10n="E">
-<image id="img_id3154123" src="res/commandimagelist/sc_recundo.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3154123">Icon</alt>
+<image id="img_id3154123" src="cmd/sc_recundo.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3154123">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
diff --git a/helpcontent2/source/text/shared/main0213.xhp b/helpcontent2/source/text/shared/main0213.xhp
index a0a2e4cb3d..f279ab8322 100644
--- a/helpcontent2/source/text/shared/main0213.xhp
+++ b/helpcontent2/source/text/shared/main0213.xhp
@@ -85,7 +85,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145647" xml-lang="en-US" l10n="E">
-<image id="img_id3147394" src="res/commandimagelist/sc_prevrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147394" xml-lang="en-US">Icon</alt>
+<image id="img_id3147394" src="cmd/sc_prevrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147394" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -101,7 +101,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3146913" xml-lang="en-US" l10n="E">
-<image id="img_id3150753" src="res/commandimagelist/sc_nextrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150753" xml-lang="en-US">Icon</alt>
+<image id="img_id3150753" src="cmd/sc_nextrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150753" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -133,7 +133,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150647" xml-lang="en-US" l10n="E">
-<image id="img_id3150941" src="res/commandimagelist/sc_recsave.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150941" xml-lang="en-US">Icon</alt>
+<image id="img_id3150941" src="cmd/sc_recsave.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150941" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -149,7 +149,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3166423" xml-lang="en-US" l10n="E">
-<image id="img_id3156138" src="res/commandimagelist/sc_recundo.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156138" xml-lang="en-US">Icon</alt>
+<image id="img_id3156138" src="cmd/sc_recundo.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156138" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -165,7 +165,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149735" xml-lang="en-US" l10n="E">
-<image id="img_id3155578" src="res/commandimagelist/sc_newrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155578" xml-lang="en-US">Icon</alt>
+<image id="img_id3155578" src="cmd/sc_newrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155578" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -181,7 +181,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145584" xml-lang="en-US" l10n="E">
-<image id="img_id3166434" src="res/commandimagelist/sc_deleterecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3166434" xml-lang="en-US">Icon</alt>
+<image id="img_id3166434" src="cmd/sc_deleterecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3166434" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/main0214.xhp b/helpcontent2/source/text/shared/main0214.xhp
index c807b9b04e..c807b9b04e 100755..100644
--- a/helpcontent2/source/text/shared/main0214.xhp
+++ b/helpcontent2/source/text/shared/main0214.xhp
diff --git a/helpcontent2/source/text/shared/main0226.xhp b/helpcontent2/source/text/shared/main0226.xhp
index e01d230b06..8ef4d7eb4f 100644
--- a/helpcontent2/source/text/shared/main0226.xhp
+++ b/helpcontent2/source/text/shared/main0226.xhp
@@ -89,7 +89,7 @@
 <paragraph role="heading" id="hd_id3148798" xml-lang="en-US" level="2" l10n="U" oldref="10"><link href="text/shared/02/01171300.xhp" name="Snap to Grid">Snap to Grid</link></paragraph>
 <paragraph role="paragraph" id="par_id3145419" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid=".uno:GridUse">Specifies that you can move objects only between grid points.</ahelp></paragraph>
 <embed href="text/shared/02/01171300.xhp#syrafang"/>
-<paragraph role="heading" id="hd_id3148920" xml-lang="en-US" level="2" l10n="U" oldref="11"><link href="text/shared/02/01171400.xhp" name="Guides When Moving">Guides When Moving</link></paragraph>
+<paragraph role="heading" id="hd_id3148920" xml-lang="en-US" level="2" l10n="U" oldref="11"><link href="text/shared/02/01171400.xhp" name="Helplines While Moving">Helplines While Moving</link></paragraph>
 <embed href="text/shared/optionen/01070100.xhp#verschieb"/>
 <embed href="text/shared/02/01171400.xhp#syhline"/>
 </body>
diff --git a/helpcontent2/source/text/shared/main0227.xhp b/helpcontent2/source/text/shared/main0227.xhp
index f0b91f6de9..a6517b590c 100644
--- a/helpcontent2/source/text/shared/main0227.xhp
+++ b/helpcontent2/source/text/shared/main0227.xhp
@@ -61,7 +61,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145366" xml-lang="en-US" l10n="E">
-<image id="img_id3153951" src="res/commandimagelist/sc_toggleobjectbeziermode.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153951" xml-lang="en-US">Icon</alt>
+<image id="img_id3153951" src="cmd/sc_toggleobjectbeziermode.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153951" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -77,7 +77,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154096" xml-lang="en-US" l10n="E">
-<image id="img_id3149377" src="res/commandimagelist/sc_beziermove.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149377" xml-lang="en-US">Icon</alt>
+<image id="img_id3149377" src="cmd/sc_beziermove.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149377" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -93,7 +93,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153838" xml-lang="en-US" l10n="E">
-<image id="img_id3146969" src="res/commandimagelist/sc_bezierinsert.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146969" xml-lang="en-US">Icon</alt>
+<image id="img_id3146969" src="cmd/sc_bezierinsert.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146969" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -109,7 +109,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3147321" xml-lang="en-US" l10n="E">
-<image id="img_id3146920" src="res/commandimagelist/sc_bezierdelete.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146920" xml-lang="en-US">Icon</alt>
+<image id="img_id3146920" src="cmd/sc_bezierdelete.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146920" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -124,7 +124,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153788" xml-lang="en-US" l10n="E">
-<image id="img_id3148489" src="res/commandimagelist/sc_beziercutline.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148489" xml-lang="en-US">Icon</alt>
+<image id="img_id3148489" src="cmd/sc_beziercutline.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148489" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -140,7 +140,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3158212" xml-lang="en-US" l10n="E">
-<image id="img_id3149036" src="res/commandimagelist/sc_bezierconvert.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149036" xml-lang="en-US">Icon</alt>
+<image id="img_id3149036" src="cmd/sc_bezierconvert.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149036" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -155,7 +155,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154576" xml-lang="en-US" l10n="E">
-<image id="img_id3154201" src="res/commandimagelist/sc_bezieredge.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154201" xml-lang="en-US">Icon</alt>
+<image id="img_id3154201" src="cmd/sc_bezieredge.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154201" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -170,7 +170,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3148813" xml-lang="en-US" l10n="E">
-<image id="img_id3151183" src="res/commandimagelist/sc_beziersmooth.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151183" xml-lang="en-US">Icon</alt>
+<image id="img_id3151183" src="cmd/sc_beziersmooth.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151183" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -185,7 +185,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153818" xml-lang="en-US" l10n="E">
-<image id="img_id3159218" src="res/commandimagelist/sc_beziersymmetric.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159218" xml-lang="en-US">Icon</alt>
+<image id="img_id3159218" src="cmd/sc_beziersymmetric.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159218" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -200,7 +200,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154344" xml-lang="en-US" l10n="E">
-<image id="img_id3148607" src="res/commandimagelist/sc_bezierclose.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148607" xml-lang="en-US">Icon</alt>
+<image id="img_id3148607" src="cmd/sc_bezierclose.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148607" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -215,7 +215,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3148970" xml-lang="en-US" l10n="E">
-<image id="img_id3155385" src="res/commandimagelist/sc_beziereliminatepoints.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155385" xml-lang="en-US">Icon</alt>
+<image id="img_id3155385" src="cmd/sc_beziereliminatepoints.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155385" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/main0400.xhp b/helpcontent2/source/text/shared/main0400.xhp
index bfdb24711c..bfdb24711c 100755..100644
--- a/helpcontent2/source/text/shared/main0400.xhp
+++ b/helpcontent2/source/text/shared/main0400.xhp
diff --git a/helpcontent2/source/text/shared/main0800.xhp b/helpcontent2/source/text/shared/main0800.xhp
index 88ea220e5c..88ea220e5c 100755..100644
--- a/helpcontent2/source/text/shared/main0800.xhp
+++ b/helpcontent2/source/text/shared/main0800.xhp
diff --git a/helpcontent2/source/text/shared/makefile.mk b/helpcontent2/source/text/shared/makefile.mk
index 72a35ef6fa..a6ee23a13b 100644
--- a/helpcontent2/source/text/shared/makefile.mk
+++ b/helpcontent2/source/text/shared/makefile.mk
@@ -50,7 +50,6 @@ XHPFILES = \
    main0201.xhp \
    main0204.xhp \
    main0208.xhp \
-   main0209.xhp \
    main0212.xhp \
    main0213.xhp \
    main0214.xhp \
diff --git a/helpcontent2/source/text/shared/optionen/01010000.xhp b/helpcontent2/source/text/shared/optionen/01010000.xhp
index 0d56186843..1bc097d280 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01010000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010000.xhp
@@ -57,8 +57,8 @@
       <embed href="text/shared/optionen/01012000.xhp#appearance"/>
       <embed href="text/shared/optionen/01013000.xhp#accessibility"/>
       <embed href="text/shared/optionen/java.xhp#java"/>
-      <embed href="text/shared/optionen/online_update.xhp#online_update"/>
-      <embed href="text/shared/optionen/improvement.xhp#improvement"/>
+<!-- fdo#33468      <embed href="text/shared/optionen/online_update.xhp#online_update"/>
+      <embed href="text/shared/optionen/improvement.xhp#improvement"/> -->
       <embed href="text/shared/00/00000001.xhp#zurueck"/>
    </body>
 </helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01010301.xhp b/helpcontent2/source/text/shared/optionen/01010301.xhp
index 8a1cb510e0..8a1cb510e0 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01010301.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010301.xhp
diff --git a/helpcontent2/source/text/shared/optionen/01011000.xhp b/helpcontent2/source/text/shared/optionen/01011000.xhp
index f9d0665c4c..f9d0665c4c 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01011000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01011000.xhp
diff --git a/helpcontent2/source/text/shared/optionen/01013000.xhp b/helpcontent2/source/text/shared/optionen/01013000.xhp
index afaf6419c3..afaf6419c3 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01013000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01013000.xhp
diff --git a/helpcontent2/source/text/shared/optionen/01014000.xhp b/helpcontent2/source/text/shared/optionen/01014000.xhp
index 2a13f84b48..2a13f84b48 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01014000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01014000.xhp
diff --git a/helpcontent2/source/text/shared/optionen/01020000.xhp b/helpcontent2/source/text/shared/optionen/01020000.xhp
index 5bb4e7a25e..5bb4e7a25e 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01020000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01020000.xhp
diff --git a/helpcontent2/source/text/shared/optionen/01020200.xhp b/helpcontent2/source/text/shared/optionen/01020200.xhp
index 4bdc245a3b..a6c81059cb 100644
--- a/helpcontent2/source/text/shared/optionen/01020200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01020200.xhp
@@ -50,7 +50,6 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#internet4"/>
 </section>
-<embed href="text/shared/guide/hyperlink_search.xhp#hyperlink_search"/>
 <paragraph role="heading" id="hd_id3154306" xml-lang="en-US" level="2" l10n="U" oldref="7">Search in</paragraph>
 <paragraph role="paragraph" id="par_id3157909" xml-lang="en-US" l10n="U" oldref="8">Specifies the search engine and its corresponding configuration.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_INET_SEARCH:LB_SEARCH" id="bm_id3150986" localize="false"/>
diff --git a/helpcontent2/source/text/shared/optionen/01020400.xhp b/helpcontent2/source/text/shared/optionen/01020400.xhp
index 30fc99d0dc..75debd20fc 100644
--- a/helpcontent2/source/text/shared/optionen/01020400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01020400.xhp
@@ -38,8 +38,10 @@
       </topic>
    </meta>
    <body>
-      <paragraph xml-lang="en-US" id="par_idN105B7" role="heading" level="1" l10n="CHG"><variable id="mozilla"><link href="text/shared/optionen/01020400.xhp" name="Browser Plugin">Browser Plug-in</link></variable></paragraph>
+      <section id="mozilla">
+      <paragraph xml-lang="en-US" id="par_idN105B7" role="heading" level="1" l10n="CHG"><link href="text/shared/optionen/01020400.xhp" name="Browser Plugin">Browser Plug-in</link></paragraph>
       <paragraph xml-lang="en-US" id="par_idN105D5" role="paragraph" l10n="NEW">Specifies to use the Mozilla plug-in to show %PRODUCTNAME documents.</paragraph>
+      </section>
       <paragraph xml-lang="en-US" id="par_idN105D8" role="paragraph" l10n="CHG">When you click any %PRODUCTNAME document hyperlink in your Mozilla or Netscape browser, one of the following can happen:</paragraph>
       <list type="ordered">
          <listitem>
@@ -64,4 +66,4 @@
 </case>
 </switch>
 </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01030000.xhp b/helpcontent2/source/text/shared/optionen/01030000.xhp
index b4a4b91431..79d344000a 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01030000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01030000.xhp
@@ -51,9 +51,9 @@
 </case>
 <case select="MAC"><embed href="text/shared/optionen/01020300.xhp#email"/>
 </case>
-</switch>
-
-<embed href="text/shared/optionen/01020400.xhp#mozilla"/>
+<default>
+</default>
+</switch><embed href="text/shared/optionen/01020400.xhp#mozilla"/>
       <embed href="text/shared/00/00000001.xhp#zurueck"/>
    </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01030300.xhp b/helpcontent2/source/text/shared/optionen/01030300.xhp
index a742a2ca7e..a742a2ca7e 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01030300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01030300.xhp
diff --git a/helpcontent2/source/text/shared/optionen/01040200.xhp b/helpcontent2/source/text/shared/optionen/01040200.xhp
index 836859bcd9..79eb511bc5 100644
--- a/helpcontent2/source/text/shared/optionen/01040200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040200.xhp
@@ -41,7 +41,7 @@
 </meta>
 <body>
 <section id="layout">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3156346"><bookmark_value>guides; showing when moving frames (Writer)</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3156346"><bookmark_value>snap lines; showing when moving frames (Writer)</bookmark_value>
 <bookmark_value>simple handles (Writer)</bookmark_value>
 <bookmark_value>handles; displaying (Writer)</bookmark_value>
 <bookmark_value>large handles (Writer)</bookmark_value>
@@ -68,10 +68,10 @@
 <section id="howtoget">
 <embed href="text/shared/00/00000406.xhp#layout"/>
 </section>
-<paragraph role="heading" id="hd_id3145072" xml-lang="en-US" level="2" l10n="U" oldref="3">Guides</paragraph>
+<paragraph role="heading" id="hd_id3145072" xml-lang="en-US" level="2" l10n="U" oldref="3">Snap Lines</paragraph>
 <paragraph role="paragraph" id="par_id3153527" xml-lang="en-US" l10n="U" oldref="4">Specifies settings that refer to the representation of boundaries.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_CROSS" id="bm_id3151110" localize="false"/><paragraph role="heading" id="hd_id3156346" xml-lang="en-US" level="3" l10n="U" oldref="9">Guides while moving</paragraph>
-<paragraph role="paragraph" id="par_id3146798" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW_CHECKBOX_TP_CONTENT_OPT_CB_CROSS">Displays guides around the frames when frames are moved. You can select the<emph> Guides while moving </emph>option to show the exact position of the object using lineal values.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_CROSS" id="bm_id3151110" localize="false"/><paragraph role="heading" id="hd_id3156346" xml-lang="en-US" level="3" l10n="U" oldref="9">Helplines While Moving</paragraph>
+<paragraph role="paragraph" id="par_id3146798" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW_CHECKBOX_TP_CONTENT_OPT_CB_CROSS">Displays snap lines around the frames when frames are moved. You can select the<emph> Helplines While Moving </emph>option to show the exact position of the object using lineal values.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_HANDLE" id="bm_id3145120" localize="false"/><paragraph role="heading" id="hd_id3155420" xml-lang="en-US" level="3" l10n="U" oldref="23">Simple handles</paragraph>
 <paragraph role="paragraph" id="par_id3156327" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW_CHECKBOX_TP_CONTENT_OPT_CB_HANDLE">Displays the handles (the eight points on a delimiting rectangle) as simple squares without 3D effect.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_BIGHANDLE" id="bm_id3149234" localize="false"/><paragraph role="heading" id="hd_id3149763" xml-lang="en-US" level="3" l10n="U" oldref="32">Large handles</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01040301.xhp b/helpcontent2/source/text/shared/optionen/01040301.xhp
index 8e320903c7..8e320903c7 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01040301.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040301.xhp
diff --git a/helpcontent2/source/text/shared/optionen/01050000.xhp b/helpcontent2/source/text/shared/optionen/01050000.xhp
index cb0cc70bfa..cb0cc70bfa 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01050000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01050000.xhp
diff --git a/helpcontent2/source/text/shared/optionen/01050100.xhp b/helpcontent2/source/text/shared/optionen/01050100.xhp
index e7d50d9423..e3364562d3 100644
--- a/helpcontent2/source/text/shared/optionen/01050100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01050100.xhp
@@ -64,10 +64,10 @@
 <paragraph xml-lang="en-US" id="hd_id3153824" role="heading" level="3" l10n="U" oldref="7">Visible grid</paragraph>
       <paragraph xml-lang="en-US" id="par_id3149516" role="paragraph" l10n="CHG" oldref="8"><variable id="rastersicht"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_GRID_VISIBLE">Specifies whether to display the grid.</ahelp>
 </variable></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3149294" role="paragraph" l10n="CHG" oldref="29"><switchinline select="appl"><caseinline select="DRAW"><variable id="rastertextdraw">It is also possible to toggle the visibility of the grid with the <emph>Grid - Visible Grid</emph> command in the context menu for the page. You can also select the <emph>Grid - Grid to Front</emph> submenu of this context menu to display the grid in front of objects.
+      <paragraph xml-lang="en-US" id="par_id3149294" role="paragraph" l10n="CHG" oldref="29"><switchinline select="appl"><caseinline select="DRAW"><variable id="rastertextdraw">It is also possible to toggle the visibility of the grid with the <emph>Grid - Display Grid</emph> command in the context menu for the page. You can also select the <emph>Grid - Grid to Front</emph> submenu of this context menu to display the grid in front of objects.
 </variable>
 </caseinline></switchinline></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3150791" role="paragraph" l10n="CHG" oldref="30"><switchinline select="appl"><caseinline select="IMPRESS"><variable id="rastertext">It is also possible to toggle the visibility of the grid with the <emph>Grid - Visible Grid</emph> command in the context menu of the page. You can also select the <emph>Grid - Grid to Front</emph> submenu of this context menu to display the grid in front of objects.
+      <paragraph xml-lang="en-US" id="par_id3150791" role="paragraph" l10n="CHG" oldref="30"><switchinline select="appl"><caseinline select="IMPRESS"><variable id="rastertext">It is also possible to toggle the visibility of the grid with the <emph>Grid - Display Grid</emph> command in the context menu of the page. You can also select the <emph>Grid - Grid to Front</emph> submenu of this context menu to display the grid in front of objects.
 </variable>
 </caseinline></switchinline></paragraph>
       <section id="aufun">
@@ -111,8 +111,8 @@
 <bookmark xml-lang="en-US" branch="hid/.uno:HelplinesFront" id="bm_id6135046" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:HelplinesFront" id="bm_id3150116" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3149419" role="heading" level="2" l10n="U"
-                 oldref="34"><switchinline select="appl"><caseinline select="DRAW">Snap Lines to Front
-</caseinline><caseinline select="IMPRESS">Snap Lines to Front
+                 oldref="34"><switchinline select="appl"><caseinline select="DRAW">Snap Lines to ~Front
+</caseinline><caseinline select="IMPRESS">Snap Lines to ~Front
 </caseinline></switchinline></paragraph>
       <paragraph xml-lang="en-US" id="par_id3150592" role="paragraph" l10n="CHG" oldref="35"><switchinline select="appl"><caseinline select="DRAW">Sets the snap lines in front of all objects.
 </caseinline><caseinline select="IMPRESS">Sets the snap lines in front of all objects.
@@ -122,4 +122,4 @@
          <paragraph xml-lang="en-US" id="par_id984221" role="paragraph" l10n="NEW">Set the grid color on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - <link href="text/shared/optionen/01012000.xhp">Appearance</link>.</paragraph>
       </section>
    </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01050300.xhp b/helpcontent2/source/text/shared/optionen/01050300.xhp
index 8c5c7faaa9..8c5c7faaa9 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01050300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01050300.xhp
diff --git a/helpcontent2/source/text/shared/optionen/01060100.xhp b/helpcontent2/source/text/shared/optionen/01060100.xhp
index 0d90f46e3a..7c5b936e56 100644
--- a/helpcontent2/source/text/shared/optionen/01060100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060100.xhp
@@ -90,7 +90,7 @@
       <paragraph xml-lang="en-US" id="par_id3151245" role="paragraph" l10n="U" oldref="35"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_PAGEBREAKS">Specifies whether to view the page breaks within a defined print area.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CONTENT:CB_GUIDELINE" id="bm_id3148946" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3149669" role="heading" level="3" l10n="U"
-                 oldref="36">Guides while moving</paragraph>
+                 oldref="36">Helplines While Moving</paragraph>
       <paragraph xml-lang="en-US" id="par_id3148550" role="paragraph" l10n="U" oldref="37"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_GUIDELINE">Specifies whether to view guides when moving drawings, frames, graphics and other objects.</ahelp> These guides help you align objects.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CONTENT:CB_HANDLES" id="bm_id3153380" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3150358" role="heading" level="3" l10n="U"
diff --git a/helpcontent2/source/text/shared/optionen/01060300.xhp b/helpcontent2/source/text/shared/optionen/01060300.xhp
index 6c623fdec1..6c623fdec1 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01060300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060300.xhp
diff --git a/helpcontent2/source/text/shared/optionen/01060401.xhp b/helpcontent2/source/text/shared/optionen/01060401.xhp
index b9bc8a6fbe..b9bc8a6fbe 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01060401.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060401.xhp
diff --git a/helpcontent2/source/text/shared/optionen/01060700.xhp b/helpcontent2/source/text/shared/optionen/01060700.xhp
index ccaa74c92b..ccaa74c92b 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01060700.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060700.xhp
diff --git a/helpcontent2/source/text/shared/optionen/01070100.xhp b/helpcontent2/source/text/shared/optionen/01070100.xhp
index 6033d6c28b..1b3c2528b3 100644
--- a/helpcontent2/source/text/shared/optionen/01070100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01070100.xhp
@@ -55,7 +55,7 @@
 <paragraph role="paragraph" id="par_id3147443" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SD_CHECKBOX_TP_OPTIONS_CONTENTS_CBX_RULER">Specifies whether to display the rulers at the top and to the left of the work area.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:HelplinesMove" id="bm_id2451068" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:HelplinesMove" id="bm_id3163712" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_HELPLINES" id="bm_id3147213" localize="false"/><paragraph role="heading" id="hd_id3145364" xml-lang="en-US" level="3" l10n="U" oldref="27">Guides when moving</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_HELPLINES" id="bm_id3147213" localize="false"/><paragraph role="heading" id="hd_id3145364" xml-lang="en-US" level="3" l10n="U" oldref="27">Helplines While Moving</paragraph>
 <paragraph role="paragraph" id="par_id3154147" xml-lang="en-US" l10n="U" oldref="28"><variable id="verschieb"><ahelp hid="SD_CHECKBOX_TP_OPTIONS_CONTENTS_CBX_HELPLINES">Specifies whether to display guides when moving an object.</ahelp>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3150488" xml-lang="en-US" l10n="U" oldref="29"><variable id="vertext"><item type="productname">%PRODUCTNAME</item> creates dotted guides that extend beyond the box containing the selected object and which cover the entire work area, helping you position the object. 
diff --git a/helpcontent2/source/text/shared/optionen/01070300.xhp b/helpcontent2/source/text/shared/optionen/01070300.xhp
index 1be580fcdb..ce8028aa65 100644
--- a/helpcontent2/source/text/shared/optionen/01070300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01070300.xhp
@@ -58,9 +58,9 @@
 <paragraph xml-lang="en-US" id="hd_id3163802" role="heading" level="3" l10n="U" oldref="8">To snap lines</paragraph>
       <paragraph xml-lang="en-US" id="par_id3149516" role="paragraph" l10n="U" oldref="9"><variable id="anlinie"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_SNAP_HELPLINES">Snaps the edge of a dragged object to the nearest snap line when you release the mouse.</ahelp>
 </variable></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3154142" role="paragraph" l10n="CHG" oldref="37">You can also define this setting by using the <switchinline select="appl"><caseinline select="IMPRESS"><link href="text/simpress/02/13140000.xhp" name="Snap to Guides"><emph>Snap to Guides</emph></link>
-</caseinline><caseinline select="DRAW"><link href="text/simpress/02/13140000.xhp" name="Snap to Guides"><emph>Snap to Guides</emph></link>
-</caseinline><defaultinline><emph>Snap to Guides</emph></defaultinline></switchinline> icon, which is available in the <emph>Options</emph> bar in a presentation or drawing document.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154142" role="paragraph" l10n="CHG" oldref="37">You can also define this setting by using the <switchinline select="appl"><caseinline select="IMPRESS"><link href="text/simpress/02/13140000.xhp" name="Snap to Snap Lines"><emph>Snap to Snap Lines</emph></link>
+</caseinline><caseinline select="DRAW"><link href="text/simpress/02/13140000.xhp" name="Snap to Snap Lines"><emph>Snap to Snap Lines</emph></link>
+</caseinline><defaultinline><emph>Snap to Snap Lines</emph></defaultinline></switchinline> icon, which is available in the <emph>Options</emph> bar in a presentation or drawing document.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:SnapBorder" id="bm_id3153254" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_BORDER" id="bm_id3153063" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3154306" role="heading" level="3" l10n="U"
diff --git a/helpcontent2/source/text/shared/optionen/01090100.xhp b/helpcontent2/source/text/shared/optionen/01090100.xhp
index 8a851d271e..bbd83ec65b 100644
--- a/helpcontent2/source/text/shared/optionen/01090100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01090100.xhp
@@ -79,7 +79,7 @@
 <paragraph role="paragraph" id="par_id3149203" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_IGNORE_SPACING">Specifies that these space wildcards will be removed if they are at the end of a line.</ahelp> In earlier versions of $[officename], adding such characters at the end of a line prevented the right edge of the formula from being cut off during printing.</paragraph>
 
 <bookmark xml-lang="en-US" branch="hid/tobeannounced" id="bm_id34459152" localize="false"/><paragraph role="heading" id="hd_id31567808" xml-lang="en-US" level="3" l10n="NEW">Embed only used symbols (smaller file size)</paragraph>
-<paragraph role="paragraph" id="par_id3789203" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Saves only those symbols which each formula that are used in that formula.</ahelp> In earlier versions of $[officename], all symbols were saved with each formula.</paragraph>
+<paragraph role="paragraph" id="par_id3789203" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Saves only those symbols with each formula that are used in that formula.</ahelp> In earlier versions of $[officename], all symbols were saved with each formula.</paragraph>
 
 
 
diff --git a/helpcontent2/source/text/shared/optionen/01110000.xhp b/helpcontent2/source/text/shared/optionen/01110000.xhp
index ea7cbcfd52..ea7cbcfd52 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01110000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01110000.xhp
diff --git a/helpcontent2/source/text/shared/optionen/01110100.xhp b/helpcontent2/source/text/shared/optionen/01110100.xhp
index a6d44e6440..a6d44e6440 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01110100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01110100.xhp
diff --git a/helpcontent2/source/text/shared/optionen/01130100.xhp b/helpcontent2/source/text/shared/optionen/01130100.xhp
index 5981a50cf4..5981a50cf4 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01130100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01130100.xhp
diff --git a/helpcontent2/source/text/shared/optionen/01140000.xhp b/helpcontent2/source/text/shared/optionen/01140000.xhp
index 0c7e811c28..0c7e811c28 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01140000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01140000.xhp
diff --git a/helpcontent2/source/text/shared/optionen/01150100.xhp b/helpcontent2/source/text/shared/optionen/01150100.xhp
index 9c9fc456d4..9c9fc456d4 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01150100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01150100.xhp
diff --git a/helpcontent2/source/text/shared/optionen/01150200.xhp b/helpcontent2/source/text/shared/optionen/01150200.xhp
index a915f6d9bf..a915f6d9bf 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01150200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01150200.xhp
diff --git a/helpcontent2/source/text/shared/optionen/01150300.xhp b/helpcontent2/source/text/shared/optionen/01150300.xhp
index 8c1375009a..8c1375009a 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01150300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01150300.xhp
diff --git a/helpcontent2/source/text/shared/optionen/01160000.xhp b/helpcontent2/source/text/shared/optionen/01160000.xhp
index 2ffb6cede2..2ffb6cede2 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01160000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01160000.xhp
diff --git a/helpcontent2/source/text/shared/optionen/01160201.xhp b/helpcontent2/source/text/shared/optionen/01160201.xhp
index 963fe57b6d..963fe57b6d 100755..100644
--- a/helpcontent2/source/text/shared/optionen/01160201.xhp
+++ b/helpcontent2/source/text/shared/optionen/01160201.xhp
diff --git a/helpcontent2/source/text/shared/optionen/javaclasspath.xhp b/helpcontent2/source/text/shared/optionen/javaclasspath.xhp
index 32c5652348..32c5652348 100755..100644
--- a/helpcontent2/source/text/shared/optionen/javaclasspath.xhp
+++ b/helpcontent2/source/text/shared/optionen/javaclasspath.xhp
diff --git a/helpcontent2/source/text/shared/optionen/javaparameters.xhp b/helpcontent2/source/text/shared/optionen/javaparameters.xhp
index fc42f592e0..fc42f592e0 100755..100644
--- a/helpcontent2/source/text/shared/optionen/javaparameters.xhp
+++ b/helpcontent2/source/text/shared/optionen/javaparameters.xhp
diff --git a/helpcontent2/source/text/shared/optionen/mailmerge.xhp b/helpcontent2/source/text/shared/optionen/mailmerge.xhp
index bc5a3316cd..bc5a3316cd 100755..100644
--- a/helpcontent2/source/text/shared/optionen/mailmerge.xhp
+++ b/helpcontent2/source/text/shared/optionen/mailmerge.xhp
diff --git a/helpcontent2/source/text/shared/optionen/makefile.mk b/helpcontent2/source/text/shared/optionen/makefile.mk
index 6804a1f093..c685eb4a7b 100644
--- a/helpcontent2/source/text/shared/optionen/makefile.mk
+++ b/helpcontent2/source/text/shared/optionen/makefile.mk
@@ -113,7 +113,6 @@ XHPFILES = \
    01160100.xhp \
    01160200.xhp \
    01160201.xhp \
-   improvement.xhp \
    java.xhp \
    javaclasspath.xhp \
    javaparameters.xhp \
@@ -121,14 +120,13 @@ XHPFILES = \
    macrosecurity_sl.xhp \
    macrosecurity_ts.xhp \
    mailmerge.xhp \
-   online_update.xhp \
    serverauthentication.xhp \
    testaccount.xhp \
    viewcertificate.xhp \
    viewcertificate_c.xhp \
    viewcertificate_d.xhp \
    viewcertificate_g.xhp 
-    
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/helpcontent2/source/text/shared/optionen/serverauthentication.xhp b/helpcontent2/source/text/shared/optionen/serverauthentication.xhp
index e831448d6f..e831448d6f 100755..100644
--- a/helpcontent2/source/text/shared/optionen/serverauthentication.xhp
+++ b/helpcontent2/source/text/shared/optionen/serverauthentication.xhp
diff --git a/helpcontent2/source/text/shared/tree_strings.xhp b/helpcontent2/source/text/shared/tree_strings.xhp
index c2955981f5..c2955981f5 100755..100644
--- a/helpcontent2/source/text/shared/tree_strings.xhp
+++ b/helpcontent2/source/text/shared/tree_strings.xhp
diff --git a/helpcontent2/source/text/simpress/00/00000004.xhp b/helpcontent2/source/text/simpress/00/00000004.xhp
index 8a7f0b5c22..d6b6513a76 100644
--- a/helpcontent2/source/text/simpress/00/00000004.xhp
+++ b/helpcontent2/source/text/simpress/00/00000004.xhp
@@ -54,7 +54,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3147435" xml-lang="en-US" l10n="E">
-<image id="img_id3156441" src="res/commandimagelist/sc_rect.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156441" xml-lang="en-US">Icon</alt>
+<image id="img_id3156441" src="cmd/sc_rect.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156441" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -69,7 +69,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150749" xml-lang="en-US" l10n="E">
-<image id="img_id3155065" src="res/commandimagelist/sc_ellipse.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155065" xml-lang="en-US">Icon</alt>
+<image id="img_id3155065" src="cmd/sc_ellipse.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155065" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -84,7 +84,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3147004" xml-lang="en-US" l10n="E">
-<image id="img_id3159236" src="res/commandimagelist/sc_linetoolbox.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159236" xml-lang="en-US">Icon</alt>
+<image id="img_id3159236" src="cmd/sc_linetoolbox.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159236" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -99,7 +99,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3156449" xml-lang="en-US" l10n="E">
-<image id="img_id3149409" src="res/commandimagelist/sc_objectalign.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149409" xml-lang="en-US">Icon</alt>
+<image id="img_id3149409" src="cmd/sc_objectalign.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149409" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -114,7 +114,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3159208" xml-lang="en-US" l10n="E">
-<image id="img_id3159231" src="res/commandimagelist/sc_bringtofront.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159231" xml-lang="en-US">Icon</alt>
+<image id="img_id3159231" src="cmd/sc_bringtofront.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159231" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/00/00000401.xhp b/helpcontent2/source/text/simpress/00/00000401.xhp
index cd5f2bd53b..cd5f2bd53b 100755..100644
--- a/helpcontent2/source/text/simpress/00/00000401.xhp
+++ b/helpcontent2/source/text/simpress/00/00000401.xhp
diff --git a/helpcontent2/source/text/simpress/00/00000402.xhp b/helpcontent2/source/text/simpress/00/00000402.xhp
index 528ff02fc8..528ff02fc8 100755..100644
--- a/helpcontent2/source/text/simpress/00/00000402.xhp
+++ b/helpcontent2/source/text/simpress/00/00000402.xhp
diff --git a/helpcontent2/source/text/simpress/00/00000403.xhp b/helpcontent2/source/text/simpress/00/00000403.xhp
index 470c0d385d..538db24dc6 100644
--- a/helpcontent2/source/text/simpress/00/00000403.xhp
+++ b/helpcontent2/source/text/simpress/00/00000403.xhp
@@ -83,7 +83,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3148768" xml-lang="en-US" l10n="E">
-<image id="img_id3148774" src="res/commandimagelist/sc_presentation.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148774" xml-lang="en-US">Icon</alt>
+<image id="img_id3148774" src="cmd/sc_presentation.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148774" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/00/00000404.xhp b/helpcontent2/source/text/simpress/00/00000404.xhp
index a32b74b3e3..958256178e 100644
--- a/helpcontent2/source/text/simpress/00/00000404.xhp
+++ b/helpcontent2/source/text/simpress/00/00000404.xhp
@@ -49,7 +49,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145251" xml-lang="en-US" l10n="E">
-<image id="img_id3151073" src="res/commandimagelist/sc_insertdoc.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151073" xml-lang="en-US">Icon</alt>
+<image id="img_id3151073" src="cmd/sc_insertdoc.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151073" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -86,7 +86,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3163703" xml-lang="en-US" l10n="E">
-<image id="img_id3145361" src="res/commandimagelist/sc_grid.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145361" xml-lang="en-US">Icon</alt>
+<image id="img_id3145361" src="cmd/sc_grid.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145361" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -106,7 +106,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3156397" xml-lang="en-US" l10n="E">
-<image id="img_id3145237" src="res/commandimagelist/sc_inserttoolbox.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145237" xml-lang="en-US">Icon</alt>
+<image id="img_id3145237" src="cmd/sc_inserttoolbox.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145237" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/00/00000405.xhp b/helpcontent2/source/text/simpress/00/00000405.xhp
index eb4d83bb78..eb4d83bb78 100755..100644
--- a/helpcontent2/source/text/simpress/00/00000405.xhp
+++ b/helpcontent2/source/text/simpress/00/00000405.xhp
diff --git a/helpcontent2/source/text/simpress/00/00000406.xhp b/helpcontent2/source/text/simpress/00/00000406.xhp
index dabe2ab469..dabe2ab469 100755..100644
--- a/helpcontent2/source/text/simpress/00/00000406.xhp
+++ b/helpcontent2/source/text/simpress/00/00000406.xhp
diff --git a/helpcontent2/source/text/simpress/00/00000407.xhp b/helpcontent2/source/text/simpress/00/00000407.xhp
index c747c9ba52..3cde33e00b 100644
--- a/helpcontent2/source/text/simpress/00/00000407.xhp
+++ b/helpcontent2/source/text/simpress/00/00000407.xhp
@@ -56,7 +56,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155603" xml-lang="en-US" l10n="E">
-<image id="img_id3149400" src="res/commandimagelist/sc_customanimation.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3149400" xml-lang="en-US">Icon</alt>
+<image id="img_id3149400" src="cmd/sc_customanimation.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3149400" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -76,7 +76,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154649" xml-lang="en-US" l10n="E">
-<image id="img_id3150205" src="res/commandimagelist/sc_animationeffects.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150205" xml-lang="en-US">Icon</alt>
+<image id="img_id3150205" src="cmd/sc_animationeffects.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150205" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/00/00000413.xhp b/helpcontent2/source/text/simpress/00/00000413.xhp
index 6f61216c08..fdcd825182 100644
--- a/helpcontent2/source/text/simpress/00/00000413.xhp
+++ b/helpcontent2/source/text/simpress/00/00000413.xhp
@@ -91,7 +91,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150537" xml-lang="en-US" l10n="E">
-<image id="img_id3145233" src="res/commandimagelist/sc_beforeobject.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145233" xml-lang="en-US">Icon</alt>
+<image id="img_id3145233" src="cmd/sc_beforeobject.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145233" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -112,7 +112,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150865" xml-lang="en-US" l10n="E">
-<image id="img_id3145597" src="res/commandimagelist/sc_behindobject.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145597" xml-lang="en-US">Icon</alt>
+<image id="img_id3145597" src="cmd/sc_behindobject.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145597" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -133,7 +133,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154327" xml-lang="en-US" l10n="E">
-<image id="img_id3155439" src="res/commandimagelist/sc_reverseorder.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155439" xml-lang="en-US">Icon</alt>
+<image id="img_id3155439" src="cmd/sc_reverseorder.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155439" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/01/01170000.xhp b/helpcontent2/source/text/simpress/01/01170000.xhp
index 6599837df0..6599837df0 100755..100644
--- a/helpcontent2/source/text/simpress/01/01170000.xhp
+++ b/helpcontent2/source/text/simpress/01/01170000.xhp
diff --git a/helpcontent2/source/text/simpress/01/01180002.xhp b/helpcontent2/source/text/simpress/01/01180002.xhp
index 713145a49f..713145a49f 100755..100644
--- a/helpcontent2/source/text/simpress/01/01180002.xhp
+++ b/helpcontent2/source/text/simpress/01/01180002.xhp
diff --git a/helpcontent2/source/text/simpress/01/02110000.xhp b/helpcontent2/source/text/simpress/01/02110000.xhp
index 62dcc6e64a..4ae985a997 100644
--- a/helpcontent2/source/text/simpress/01/02110000.xhp
+++ b/helpcontent2/source/text/simpress/01/02110000.xhp
@@ -74,7 +74,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155925" xml-lang="en-US" l10n="E">
-<image id="img_id3155931" src="res/commandimagelist/sc_firstrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155931" xml-lang="en-US">Icon</alt>
+<image id="img_id3155931" src="cmd/sc_firstrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155931" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -88,7 +88,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153045" xml-lang="en-US" l10n="E">
-<image id="img_id3157976" src="res/commandimagelist/sc_prevrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3157976" xml-lang="en-US">Icon</alt>
+<image id="img_id3157976" src="cmd/sc_prevrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3157976" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -102,7 +102,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3083279" xml-lang="en-US" l10n="E">
-<image id="img_id3083286" src="res/commandimagelist/sc_nextrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3083286" xml-lang="en-US">Icon</alt>
+<image id="img_id3083286" src="cmd/sc_nextrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3083286" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -116,7 +116,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3151183" xml-lang="en-US" l10n="E">
-<image id="img_id3156315" src="res/commandimagelist/sc_lastrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156315" xml-lang="en-US">Icon</alt>
+<image id="img_id3156315" src="cmd/sc_lastrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156315" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -140,7 +140,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145411" xml-lang="en-US" l10n="E">
-<image id="img_id3145418" src="res/commandimagelist/sc_chainframes.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145418" xml-lang="en-US">Icon</alt>
+<image id="img_id3145418" src="cmd/sc_chainframes.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145418" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/01/03151000.xhp b/helpcontent2/source/text/simpress/01/03151000.xhp
index 2f4847f8ef..2f4847f8ef 100755..100644
--- a/helpcontent2/source/text/simpress/01/03151000.xhp
+++ b/helpcontent2/source/text/simpress/01/03151000.xhp
diff --git a/helpcontent2/source/text/simpress/01/03151100.xhp b/helpcontent2/source/text/simpress/01/03151100.xhp
index 36f294f992..36f294f992 100755..100644
--- a/helpcontent2/source/text/simpress/01/03151100.xhp
+++ b/helpcontent2/source/text/simpress/01/03151100.xhp
diff --git a/helpcontent2/source/text/simpress/01/03151200.xhp b/helpcontent2/source/text/simpress/01/03151200.xhp
index c4cb42f4f5..c4cb42f4f5 100755..100644
--- a/helpcontent2/source/text/simpress/01/03151200.xhp
+++ b/helpcontent2/source/text/simpress/01/03151200.xhp
diff --git a/helpcontent2/source/text/simpress/01/04110100.xhp b/helpcontent2/source/text/simpress/01/04110100.xhp
index 881505c360..881505c360 100755..100644
--- a/helpcontent2/source/text/simpress/01/04110100.xhp
+++ b/helpcontent2/source/text/simpress/01/04110100.xhp
diff --git a/helpcontent2/source/text/simpress/01/04110200.xhp b/helpcontent2/source/text/simpress/01/04110200.xhp
index 8029138436..8029138436 100755..100644
--- a/helpcontent2/source/text/simpress/01/04110200.xhp
+++ b/helpcontent2/source/text/simpress/01/04110200.xhp
diff --git a/helpcontent2/source/text/simpress/01/04990000.xhp b/helpcontent2/source/text/simpress/01/04990000.xhp
index c4e7441693..c4e7441693 100755..100644
--- a/helpcontent2/source/text/simpress/01/04990000.xhp
+++ b/helpcontent2/source/text/simpress/01/04990000.xhp
diff --git a/helpcontent2/source/text/simpress/01/05100000.xhp b/helpcontent2/source/text/simpress/01/05100000.xhp
index aaf0072cce..bae0fad630 100644
--- a/helpcontent2/source/text/simpress/01/05100000.xhp
+++ b/helpcontent2/source/text/simpress/01/05100000.xhp
@@ -59,7 +59,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154253" xml-lang="en-US" l10n="E">
-<image id="img_id3156382" src="res/commandimagelist/sc_presentation.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156382" xml-lang="en-US">Icon</alt>
+<image id="img_id3156382" src="cmd/sc_presentation.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156382" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -74,7 +74,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145587" xml-lang="en-US" l10n="E">
-<image id="img_id3150370" src="res/commandimagelist/sc_objectcatalog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150370" xml-lang="en-US">Icon</alt>
+<image id="img_id3150370" src="cmd/sc_objectcatalog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150370" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -88,7 +88,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3156020" xml-lang="en-US" l10n="E">
-<image id="img_id3153246" src="res/commandimagelist/sc_fillstyle.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153246" xml-lang="en-US">Icon</alt>
+<image id="img_id3153246" src="cmd/sc_fillstyle.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153246" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -102,7 +102,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3147297" xml-lang="en-US" l10n="E">
-<image id="img_id3151390" src="res/commandimagelist/sc_stylenewbyexample.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151390" xml-lang="en-US">Icon</alt>
+<image id="img_id3151390" src="cmd/sc_stylenewbyexample.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151390" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -116,7 +116,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149888" xml-lang="en-US" l10n="E">
-<image id="img_id3146878" src="res/commandimagelist/sc_styleupdatebyexample.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146878" xml-lang="en-US">Icon</alt>
+<image id="img_id3146878" src="cmd/sc_styleupdatebyexample.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146878" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/01/05110500m.xhp b/helpcontent2/source/text/simpress/01/05110500m.xhp
index 75ed9f4b14..cdbd27d849 100644
--- a/helpcontent2/source/text/simpress/01/05110500m.xhp
+++ b/helpcontent2/source/text/simpress/01/05110500m.xhp
@@ -52,7 +52,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3147555" xml-lang="en-US" l10n="E">
-<image id="img_id3150361" src="res/commandimagelist/sc_deleterows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150361" xml-lang="en-US">Icon</alt>
+<image id="img_id3150361" src="cmd/sc_deleterows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150361" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/simpress/01/05120500m.xhp b/helpcontent2/source/text/simpress/01/05120500m.xhp
index 5c15770357..4dde284901 100644
--- a/helpcontent2/source/text/simpress/01/05120500m.xhp
+++ b/helpcontent2/source/text/simpress/01/05120500m.xhp
@@ -53,7 +53,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3153600" xml-lang="en-US" l10n="E">
-<image id="img_id3153607" src="res/commandimagelist/sc_deletecolumns.png" width="0.566cm" height="0.566cm"><alt id="alt_id3153607" xml-lang="en-US">Icon</alt>
+<image id="img_id3153607" src="cmd/sc_deletecolumns.png" width="0.566cm" height="0.566cm"><alt id="alt_id3153607" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/simpress/01/13050000.xhp b/helpcontent2/source/text/simpress/01/13050000.xhp
index 0642447887..0642447887 100755..100644
--- a/helpcontent2/source/text/simpress/01/13050000.xhp
+++ b/helpcontent2/source/text/simpress/01/13050000.xhp
diff --git a/helpcontent2/source/text/simpress/01/13180000.xhp b/helpcontent2/source/text/simpress/01/13180000.xhp
index 15cebe5fa0..15cebe5fa0 100755..100644
--- a/helpcontent2/source/text/simpress/01/13180000.xhp
+++ b/helpcontent2/source/text/simpress/01/13180000.xhp
diff --git a/helpcontent2/source/text/simpress/01/slidesorter.xhp b/helpcontent2/source/text/simpress/01/slidesorter.xhp
index bdb7c90406..bdb7c90406 100755..100644
--- a/helpcontent2/source/text/simpress/01/slidesorter.xhp
+++ b/helpcontent2/source/text/simpress/01/slidesorter.xhp
diff --git a/helpcontent2/source/text/simpress/02/04010000.xhp b/helpcontent2/source/text/simpress/02/04010000.xhp
index d4acc04baf..721c23d576 100644
--- a/helpcontent2/source/text/simpress/02/04010000.xhp
+++ b/helpcontent2/source/text/simpress/02/04010000.xhp
@@ -54,7 +54,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3148772" xml-lang="en-US" l10n="E">
-<image id="img_id3156067" src="res/commandimagelist/sc_hideslide.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156067" xml-lang="en-US">Icon</alt>
+<image id="img_id3156067" src="cmd/sc_hideslide.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156067" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/02/04030000.xhp b/helpcontent2/source/text/simpress/02/04030000.xhp
index a67092ec83..a67092ec83 100755..100644
--- a/helpcontent2/source/text/simpress/02/04030000.xhp
+++ b/helpcontent2/source/text/simpress/02/04030000.xhp
diff --git a/helpcontent2/source/text/simpress/02/04040000.xhp b/helpcontent2/source/text/simpress/02/04040000.xhp
index 832bc48e86..832bc48e86 100755..100644
--- a/helpcontent2/source/text/simpress/02/04040000.xhp
+++ b/helpcontent2/source/text/simpress/02/04040000.xhp
diff --git a/helpcontent2/source/text/simpress/02/04060000.xhp b/helpcontent2/source/text/simpress/02/04060000.xhp
index 4a00dc064b..4a00dc064b 100755..100644
--- a/helpcontent2/source/text/simpress/02/04060000.xhp
+++ b/helpcontent2/source/text/simpress/02/04060000.xhp
diff --git a/helpcontent2/source/text/simpress/02/04070000.xhp b/helpcontent2/source/text/simpress/02/04070000.xhp
index 0f996d9a20..7f6ebdda5a 100644
--- a/helpcontent2/source/text/simpress/02/04070000.xhp
+++ b/helpcontent2/source/text/simpress/02/04070000.xhp
@@ -52,7 +52,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3156385" xml-lang="en-US" l10n="E">
-<image id="img_id3155962" src="res/commandimagelist/sc_rehearsetimings.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155962" xml-lang="en-US">Icon</alt>
+<image id="img_id3155962" src="cmd/sc_rehearsetimings.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155962" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/02/10020000.xhp b/helpcontent2/source/text/simpress/02/10020000.xhp
index 0348e1887a..6a43a6ec0f 100644
--- a/helpcontent2/source/text/simpress/02/10020000.xhp
+++ b/helpcontent2/source/text/simpress/02/10020000.xhp
@@ -58,7 +58,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3148569" xml-lang="en-US" l10n="E">
-<image id="img_id3150205" src="res/commandimagelist/sc_zoompage.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150205" xml-lang="en-US">Icon</alt>
+<image id="img_id3150205" src="cmd/sc_zoompage.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150205" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -73,7 +73,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145113" xml-lang="en-US" l10n="E">
-<image id="img_id3153070" src="res/commandimagelist/sc_zoom.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153070" xml-lang="en-US">Icon</alt>
+<image id="img_id3153070" src="cmd/sc_zoom.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153070" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -92,7 +92,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145590" xml-lang="en-US" l10n="E">
-<image id="img_id3145596" src="res/commandimagelist/sc_zoomin.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145596" xml-lang="en-US">Icon</alt>
+<image id="img_id3145596" src="cmd/sc_zoomin.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145596" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -108,7 +108,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145247" xml-lang="en-US" l10n="E">
-<image id="img_id3145355" src="res/commandimagelist/sc_zoomout.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145355" xml-lang="en-US">Icon</alt>
+<image id="img_id3145355" src="cmd/sc_zoomout.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145355" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -125,7 +125,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155410" xml-lang="en-US" l10n="E">
-<image id="img_id3155988" src="res/commandimagelist/sc_zoom100percent.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155988" xml-lang="en-US">Icon</alt>
+<image id="img_id3155988" src="cmd/sc_zoom100percent.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155988" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -143,7 +143,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154642" xml-lang="en-US" l10n="E">
-<image id="img_id3145202" src="res/commandimagelist/sc_zoomprevious.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145202" xml-lang="en-US">Icon</alt>
+<image id="img_id3145202" src="cmd/sc_zoomprevious.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145202" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -161,7 +161,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153908" xml-lang="en-US" l10n="E">
-<image id="img_id3154932" src="res/commandimagelist/sc_zoomnext.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154932" xml-lang="en-US">Icon</alt>
+<image id="img_id3154932" src="cmd/sc_zoomnext.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154932" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -178,7 +178,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154102" xml-lang="en-US" l10n="E">
-<image id="img_id3153679" src="res/commandimagelist/sc_printpreview.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153679" xml-lang="en-US">Icon</alt>
+<image id="img_id3153679" src="cmd/sc_printpreview.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153679" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -195,7 +195,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150982" xml-lang="en-US" l10n="E">
-<image id="img_id3147531" src="res/commandimagelist/sc_zoompagewidth.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147531" xml-lang="en-US">Icon</alt>
+<image id="img_id3147531" src="cmd/sc_zoompagewidth.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147531" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -212,7 +212,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154569" xml-lang="en-US" l10n="E">
-<image id="img_id3154576" src="res/commandimagelist/sc_zoomoptimal.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154576" xml-lang="en-US">Icon</alt>
+<image id="img_id3154576" src="cmd/sc_zoomoptimal.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154576" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -229,7 +229,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154134" xml-lang="en-US" l10n="E">
-<image id="img_id3154141" src="res/commandimagelist/sc_zoomoptimal.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154141" xml-lang="en-US">Icon</alt>
+<image id="img_id3154141" src="cmd/sc_zoomoptimal.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154141" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -246,7 +246,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3151253" xml-lang="en-US" l10n="E">
-<image id="img_id3151259" src="res/commandimagelist/sc_zoompanning.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151259" xml-lang="en-US">Icon</alt>
+<image id="img_id3151259" src="cmd/sc_zoompanning.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151259" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/02/10030000.xhp b/helpcontent2/source/text/simpress/02/10030000.xhp
index 3a59c641d8..efd2aa84f2 100644
--- a/helpcontent2/source/text/simpress/02/10030000.xhp
+++ b/helpcontent2/source/text/simpress/02/10030000.xhp
@@ -66,7 +66,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149665" xml-lang="en-US" l10n="E">
-<image id="img_id3154490" src="res/commandimagelist/sc_toggleobjectrotatemode.png" width="5.64mm" height="5.64mm"><alt id="alt_id3154490" xml-lang="en-US">Icon</alt>
+<image id="img_id3154490" src="cmd/sc_toggleobjectrotatemode.png" width="5.64mm" height="5.64mm"><alt id="alt_id3154490" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -86,7 +86,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3146962" xml-lang="en-US" l10n="E">
-<image id="img_id3153811" src="res/commandimagelist/sc_toggleobjectrotatemode.png" width="5.64mm" height="5.64mm"><alt id="alt_id3153811" xml-lang="en-US">Icon</alt>
+<image id="img_id3153811" src="cmd/sc_toggleobjectrotatemode.png" width="5.64mm" height="5.64mm"><alt id="alt_id3153811" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -104,7 +104,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153035" xml-lang="en-US" l10n="E">
-<image id="img_id3153932" src="res/commandimagelist/sc_mirror.png" width="5.64mm" height="5.64mm"><alt id="alt_id3153932" xml-lang="en-US">Icon</alt>
+<image id="img_id3153932" src="cmd/sc_mirror.png" width="5.64mm" height="5.64mm"><alt id="alt_id3153932" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -139,7 +139,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3147167" xml-lang="en-US" l10n="E">
-<image id="img_id3083443" src="res/commandimagelist/sc_crookslant.png" width="5.64mm" height="5.64mm"><alt id="alt_id3083443" xml-lang="en-US">Icon</alt>
+<image id="img_id3083443" src="cmd/sc_crookslant.png" width="5.64mm" height="5.64mm"><alt id="alt_id3083443" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -156,7 +156,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150875" xml-lang="en-US" l10n="E">
-<image id="img_id3150882" src="res/commandimagelist/sc_crookrotate.png" width="5.64mm" height="5.64mm"><alt id="alt_id3150882" xml-lang="en-US">Icon</alt>
+<image id="img_id3150882" src="cmd/sc_crookrotate.png" width="5.64mm" height="5.64mm"><alt id="alt_id3150882" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -173,7 +173,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154693" xml-lang="en-US" l10n="E">
-<image id="img_id3154933" src="res/commandimagelist/sc_shear.png" width="5.64mm" height="5.64mm"><alt id="alt_id3154933" xml-lang="en-US">Icon</alt>
+<image id="img_id3154933" src="cmd/sc_shear.png" width="5.64mm" height="5.64mm"><alt id="alt_id3154933" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -192,7 +192,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154602" xml-lang="en-US" l10n="E">
-<image id="img_id3154790" src="res/commandimagelist/sc_interactivetransparence.png" width="5.64mm" height="5.64mm"><alt id="alt_id3154790" xml-lang="en-US">Icon</alt>
+<image id="img_id3154790" src="cmd/sc_interactivetransparence.png" width="5.64mm" height="5.64mm"><alt id="alt_id3154790" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -210,7 +210,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150990" xml-lang="en-US" l10n="E">
-<image id="img_id3151102" src="res/commandimagelist/sc_interactivegradient.png" width="5.64mm" height="5.64mm"><alt id="alt_id3151102" xml-lang="en-US">Icon</alt>
+<image id="img_id3151102" src="cmd/sc_interactivegradient.png" width="5.64mm" height="5.64mm"><alt id="alt_id3151102" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/02/10030200.xhp b/helpcontent2/source/text/simpress/02/10030200.xhp
index c272d4f81f..55509ee8ae 100644
--- a/helpcontent2/source/text/simpress/02/10030200.xhp
+++ b/helpcontent2/source/text/simpress/02/10030200.xhp
@@ -55,7 +55,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3157876" xml-lang="en-US" l10n="E">
-<image id="img_id3150650" src="res/commandimagelist/sc_glueinsertpoint.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150650" xml-lang="en-US">Icon</alt>
+<image id="img_id3150650" src="cmd/sc_glueinsertpoint.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150650" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -72,7 +72,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3145165" xml-lang="en-US" l10n="E">
-<image id="img_id3153567" src="res/commandimagelist/sc_glueescapedirectionleft.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153567" xml-lang="en-US">Icon</alt>
+<image id="img_id3153567" src="cmd/sc_glueescapedirectionleft.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153567" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -89,7 +89,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3153042" xml-lang="en-US" l10n="E">
-<image id="img_id3148386" src="res/commandimagelist/sc_glueescapedirectiontop.png" width="0.423cm" height="0.423cm"><alt id="alt_id3148386" xml-lang="en-US">Icon</alt>
+<image id="img_id3148386" src="cmd/sc_glueescapedirectiontop.png" width="0.423cm" height="0.423cm"><alt id="alt_id3148386" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -106,7 +106,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3155401" xml-lang="en-US" l10n="E">
-<image id="img_id3156256" src="res/commandimagelist/sc_glueescapedirectionright.png" width="0.423cm" height="0.423cm"><alt id="alt_id3156256" xml-lang="en-US">Icon</alt>
+<image id="img_id3156256" src="cmd/sc_glueescapedirectionright.png" width="0.423cm" height="0.423cm"><alt id="alt_id3156256" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -123,7 +123,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3145204" xml-lang="en-US" l10n="E">
-<image id="img_id3150756" src="res/commandimagelist/sc_glueescapedirectionbottom.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150756" xml-lang="en-US">Icon</alt>
+<image id="img_id3150756" src="cmd/sc_glueescapedirectionbottom.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150756" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -140,7 +140,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3153622" xml-lang="en-US" l10n="E">
-<image id="img_id3153149" src="res/commandimagelist/sc_gluepercent.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153149" xml-lang="en-US">Icon</alt>
+<image id="img_id3153149" src="cmd/sc_gluepercent.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153149" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -157,7 +157,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3154934" xml-lang="en-US" l10n="E">
-<image id="img_id3148829" src="res/commandimagelist/sc_gluehorzalignleft.png" width="0.423cm" height="0.423cm"><alt id="alt_id3148829" xml-lang="en-US">Icon</alt>
+<image id="img_id3148829" src="cmd/sc_gluehorzalignleft.png" width="0.423cm" height="0.423cm"><alt id="alt_id3148829" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -174,7 +174,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3148910" xml-lang="en-US" l10n="E">
-<image id="img_id3148919" src="res/commandimagelist/sc_gluehorzaligncenter.png" width="0.423cm" height="0.423cm"><alt id="alt_id3148919" xml-lang="en-US">Icon</alt>
+<image id="img_id3148919" src="cmd/sc_gluehorzaligncenter.png" width="0.423cm" height="0.423cm"><alt id="alt_id3148919" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -191,7 +191,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3148627" xml-lang="en-US" l10n="E">
-<image id="img_id3149808" src="res/commandimagelist/sc_gluehorzalignright.png" width="0.423cm" height="0.423cm"><alt id="alt_id3149808" xml-lang="en-US">Icon</alt>
+<image id="img_id3149808" src="cmd/sc_gluehorzalignright.png" width="0.423cm" height="0.423cm"><alt id="alt_id3149808" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -208,7 +208,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3154481" xml-lang="en-US" l10n="E">
-<image id="img_id3154571" src="res/commandimagelist/sc_gluevertaligntop.png" width="0.423cm" height="0.423cm"><alt id="alt_id3154571" xml-lang="en-US">Icon</alt>
+<image id="img_id3154571" src="cmd/sc_gluevertaligntop.png" width="0.423cm" height="0.423cm"><alt id="alt_id3154571" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -225,7 +225,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150996" xml-lang="en-US" l10n="E">
-<image id="img_id3151106" src="res/commandimagelist/sc_gluevertaligncenter.png" width="0.423cm" height="0.423cm"><alt id="alt_id3151106" xml-lang="en-US">Icon</alt>
+<image id="img_id3151106" src="cmd/sc_gluevertaligncenter.png" width="0.423cm" height="0.423cm"><alt id="alt_id3151106" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -242,7 +242,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150644" xml-lang="en-US" l10n="E">
-<image id="img_id3154192" src="res/commandimagelist/sc_gluevertalignbottom.png" width="0.423cm" height="0.423cm"><alt id="alt_id3154192" xml-lang="en-US">Icon</alt>
+<image id="img_id3154192" src="cmd/sc_gluevertalignbottom.png" width="0.423cm" height="0.423cm"><alt id="alt_id3154192" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/simpress/02/10050000.xhp b/helpcontent2/source/text/simpress/02/10050000.xhp
index ec5397946d..c59a7b6d6e 100644
--- a/helpcontent2/source/text/simpress/02/10050000.xhp
+++ b/helpcontent2/source/text/simpress/02/10050000.xhp
@@ -58,7 +58,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149875" xml-lang="en-US" l10n="E">
-<image id="img_id3153070" src="res/commandimagelist/sc_drawtext.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153070" xml-lang="en-US">Icon</alt>
+<image id="img_id3153070" src="cmd/sc_drawtext.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153070" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -74,7 +74,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145826" xml-lang="en-US" l10n="E">
-<image id="img_id3153038" src="res/commandimagelist/sc_textfittosizetool.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153038" xml-lang="en-US">Icon</alt>
+<image id="img_id3153038" src="cmd/sc_textfittosizetool.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153038" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -88,7 +88,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150019" xml-lang="en-US" l10n="E">
-<image id="img_id3153738" src="res/commandimagelist/sc_drawcaption.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153738" xml-lang="en-US">Icon</alt>
+<image id="img_id3153738" src="cmd/sc_drawcaption.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153738" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -106,7 +106,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3147537" xml-lang="en-US" l10n="E">
-<image id="img_id3154869" src="res/commandimagelist/sc_verticaltextfittosizetool.png" width="0.1335inch" height="0.1335inch"><alt id="alt_id3154869" xml-lang="en-US">Icon</alt>
+<image id="img_id3154869" src="cmd/sc_verticaltextfittosizetool.png" width="0.1335inch" height="0.1335inch"><alt id="alt_id3154869" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/02/10060000.xhp b/helpcontent2/source/text/simpress/02/10060000.xhp
index 033dd6c294..683cf53a9a 100644
--- a/helpcontent2/source/text/simpress/02/10060000.xhp
+++ b/helpcontent2/source/text/simpress/02/10060000.xhp
@@ -61,7 +61,7 @@ dedr: fixed #i30767#</lastedited>
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145828" xml-lang="en-US" l10n="E">
-<image id="img_id3148729" src="res/commandimagelist/sc_rect.png" width="5.64mm" height="5.64mm"><alt id="alt_id3148729" xml-lang="en-US">Icon</alt>
+<image id="img_id3148729" src="cmd/sc_rect.png" width="5.64mm" height="5.64mm"><alt id="alt_id3148729" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -78,7 +78,7 @@ dedr: fixed #i30767#</lastedited>
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149879" xml-lang="en-US" l10n="E">
-<image id="img_id3149884" src="res/commandimagelist/sc_square.png" width="5.64mm" height="5.64mm"><alt id="alt_id3149884" xml-lang="en-US">Icon</alt>
+<image id="img_id3149884" src="cmd/sc_square.png" width="5.64mm" height="5.64mm"><alt id="alt_id3149884" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -95,7 +95,7 @@ dedr: fixed #i30767#</lastedited>
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154870" xml-lang="en-US" l10n="E">
-<image id="img_id3150467" src="res/commandimagelist/sc_rect_rounded.png" width="5.64mm" height="5.64mm"><alt id="alt_id3150467" xml-lang="en-US">Icon</alt>
+<image id="img_id3150467" src="cmd/sc_rect_rounded.png" width="5.64mm" height="5.64mm"><alt id="alt_id3150467" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -112,7 +112,7 @@ dedr: fixed #i30767#</lastedited>
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3156323" xml-lang="en-US" l10n="E">
-<image id="img_id3151189" src="res/commandimagelist/sc_square_rounded.png" width="5.64mm" height="5.64mm"><alt id="alt_id3151189" xml-lang="en-US">Icon</alt>
+<image id="img_id3151189" src="cmd/sc_square_rounded.png" width="5.64mm" height="5.64mm"><alt id="alt_id3151189" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -129,7 +129,7 @@ dedr: fixed #i30767#</lastedited>
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3159179" xml-lang="en-US" l10n="E">
-<image id="img_id3159186" src="res/commandimagelist/sc_rect_unfilled.png" width="5.64mm" height="5.64mm"><alt id="alt_id3159186" xml-lang="en-US">Icon</alt>
+<image id="img_id3159186" src="cmd/sc_rect_unfilled.png" width="5.64mm" height="5.64mm"><alt id="alt_id3159186" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -146,7 +146,7 @@ dedr: fixed #i30767#</lastedited>
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154268" xml-lang="en-US" l10n="E">
-<image id="img_id3147510" src="res/commandimagelist/sc_square_unfilled.png" width="5.64mm" height="5.64mm"><alt id="alt_id3147510" xml-lang="en-US">Icon</alt>
+<image id="img_id3147510" src="cmd/sc_square_unfilled.png" width="5.64mm" height="5.64mm"><alt id="alt_id3147510" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -163,7 +163,7 @@ dedr: fixed #i30767#</lastedited>
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154603" xml-lang="en-US" l10n="E">
-<image id="img_id3154610" src="res/commandimagelist/sc_rect_rounded_unfilled.png" width="5.64mm" height="5.64mm"><alt id="alt_id3154610" xml-lang="en-US">Icon</alt>
+<image id="img_id3154610" src="cmd/sc_rect_rounded_unfilled.png" width="5.64mm" height="5.64mm"><alt id="alt_id3154610" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -180,7 +180,7 @@ dedr: fixed #i30767#</lastedited>
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154565" xml-lang="en-US" l10n="E">
-<image id="img_id3154571" src="res/commandimagelist/sc_square_rounded_unfilled.png" width="5.64mm" height="5.64mm"><alt id="alt_id3154571" xml-lang="en-US">Icon</alt>
+<image id="img_id3154571" src="cmd/sc_square_rounded_unfilled.png" width="5.64mm" height="5.64mm"><alt id="alt_id3154571" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/02/10070000.xhp b/helpcontent2/source/text/simpress/02/10070000.xhp
index e6516a6fb7..b05deb4452 100644
--- a/helpcontent2/source/text/simpress/02/10070000.xhp
+++ b/helpcontent2/source/text/simpress/02/10070000.xhp
@@ -56,7 +56,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3147300" xml-lang="en-US" l10n="E">
-<image id="img_id3151391" src="res/commandimagelist/sc_ellipse.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151391" xml-lang="en-US">Icon</alt>
+<image id="img_id3151391" src="cmd/sc_ellipse.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151391" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -71,7 +71,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153930" xml-lang="en-US" l10n="E">
-<image id="img_id3153936" src="res/commandimagelist/sc_circle.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153936" xml-lang="en-US">Icon</alt>
+<image id="img_id3153936" src="cmd/sc_circle.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153936" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -85,7 +85,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150932" xml-lang="en-US" l10n="E">
-<image id="img_id3145295" src="res/commandimagelist/sc_pie.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145295" xml-lang="en-US">Icon</alt>
+<image id="img_id3145295" src="cmd/sc_pie.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145295" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -100,7 +100,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153716" xml-lang="en-US" l10n="E">
-<image id="img_id3153722" src="res/commandimagelist/sc_circlepie.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153722" xml-lang="en-US">Icon</alt>
+<image id="img_id3153722" src="cmd/sc_circlepie.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153722" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -115,7 +115,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150254" xml-lang="en-US" l10n="E">
-<image id="img_id3150261" src="res/commandimagelist/sc_ellipsecut.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150261" xml-lang="en-US">Icon</alt>
+<image id="img_id3150261" src="cmd/sc_ellipsecut.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150261" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -129,7 +129,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153910" xml-lang="en-US" l10n="E">
-<image id="img_id3154692" src="res/commandimagelist/sc_circlecut.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154692" xml-lang="en-US">Icon</alt>
+<image id="img_id3154692" src="cmd/sc_circlecut.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154692" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -144,7 +144,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150702" xml-lang="en-US" l10n="E">
-<image id="img_id3150708" src="res/commandimagelist/sc_ellipse_unfilled.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150708" xml-lang="en-US">Icon</alt>
+<image id="img_id3150708" src="cmd/sc_ellipse_unfilled.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150708" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -159,7 +159,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150984" xml-lang="en-US" l10n="E">
-<image id="img_id3150990" src="res/commandimagelist/sc_circle_unfilled.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150990" xml-lang="en-US">Icon</alt>
+<image id="img_id3150990" src="cmd/sc_circle_unfilled.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150990" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -174,7 +174,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150359" xml-lang="en-US" l10n="E">
-<image id="img_id3151313" src="res/commandimagelist/sc_pie_unfilled.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151313" xml-lang="en-US">Icon</alt>
+<image id="img_id3151313" src="cmd/sc_pie_unfilled.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151313" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -189,7 +189,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154199" xml-lang="en-US" l10n="E">
-<image id="img_id3146925" src="res/commandimagelist/sc_circlepie_unfilled.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146925" xml-lang="en-US">Icon</alt>
+<image id="img_id3146925" src="cmd/sc_circlepie_unfilled.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146925" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -204,7 +204,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149483" xml-lang="en-US" l10n="E">
-<image id="img_id3149490" src="res/commandimagelist/sc_ellipsecut_unfilled.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149490" xml-lang="en-US">Icon</alt>
+<image id="img_id3149490" src="cmd/sc_ellipsecut_unfilled.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149490" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -219,7 +219,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3148972" xml-lang="en-US" l10n="E">
-<image id="img_id3148979" src="res/commandimagelist/sc_circlecut_unfilled.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148979" xml-lang="en-US">Icon</alt>
+<image id="img_id3148979" src="cmd/sc_circlecut_unfilled.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148979" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -233,7 +233,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3152771" xml-lang="en-US" l10n="E">
-<image id="img_id3152778" src="res/commandimagelist/sc_arc.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152778" xml-lang="en-US">Icon</alt>
+<image id="img_id3152778" src="cmd/sc_arc.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152778" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -248,7 +248,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154380" xml-lang="en-US" l10n="E">
-<image id="img_id3154386" src="res/commandimagelist/sc_circlearc.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154386" xml-lang="en-US">Icon</alt>
+<image id="img_id3154386" src="cmd/sc_circlearc.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154386" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/02/10080000.xhp b/helpcontent2/source/text/simpress/02/10080000.xhp
index d3bb31f21a..3740420c71 100644
--- a/helpcontent2/source/text/simpress/02/10080000.xhp
+++ b/helpcontent2/source/text/simpress/02/10080000.xhp
@@ -64,7 +64,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3148773" xml-lang="en-US" l10n="E">
-<image id="img_id3150936" src="res/commandimagelist/sc_bezierfill.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150936" xml-lang="en-US">Icon</alt>
+<image id="img_id3150936" src="cmd/sc_bezierfill.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150936" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -81,7 +81,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153720" xml-lang="en-US" l10n="E">
-<image id="img_id3083443" src="res/commandimagelist/sc_polygon.png" width="0.222inch" height="0.222inch"><alt id="alt_id3083443" xml-lang="en-US">Icon</alt>
+<image id="img_id3083443" src="cmd/sc_polygon.png" width="0.222inch" height="0.222inch"><alt id="alt_id3083443" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -98,7 +98,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153624" xml-lang="en-US" l10n="E">
-<image id="img_id3149976" src="res/commandimagelist/sc_polygon_diagonal.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149976" xml-lang="en-US">Icon</alt>
+<image id="img_id3149976" src="cmd/sc_polygon_diagonal.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149976" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -115,7 +115,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3148833" xml-lang="en-US" l10n="E">
-<image id="img_id3145410" src="res/commandimagelist/sc_freeline.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145410" xml-lang="en-US">Icon</alt>
+<image id="img_id3145410" src="cmd/sc_freeline.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145410" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -130,7 +130,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154100" xml-lang="en-US" l10n="E">
-<image id="img_id3154106" src="res/commandimagelist/sc_bezier_unfilled.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154106" xml-lang="en-US">Icon</alt>
+<image id="img_id3154106" src="cmd/sc_bezier_unfilled.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154106" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -145,7 +145,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153780" xml-lang="en-US" l10n="E">
-<image id="img_id3146123" src="res/commandimagelist/sc_polygon_unfilled.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146123" xml-lang="en-US">Icon</alt>
+<image id="img_id3146123" src="cmd/sc_polygon_unfilled.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146123" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -161,7 +161,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3151108" xml-lang="en-US" l10n="E">
-<image id="img_id3150987" src="res/commandimagelist/sc_polygon_diagonal_unfilled.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150987" xml-lang="en-US">Icon</alt>
+<image id="img_id3150987" src="cmd/sc_polygon_diagonal_unfilled.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150987" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -176,7 +176,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3159188" xml-lang="en-US" l10n="E">
-<image id="img_id3159194" src="res/commandimagelist/sc_linetoolbox.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159194" xml-lang="en-US">Icon</alt>
+<image id="img_id3159194" src="cmd/sc_linetoolbox.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159194" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/02/10090000.xhp b/helpcontent2/source/text/simpress/02/10090000.xhp
index cc1078e316..fc87745ad4 100644
--- a/helpcontent2/source/text/simpress/02/10090000.xhp
+++ b/helpcontent2/source/text/simpress/02/10090000.xhp
@@ -61,7 +61,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154767" xml-lang="en-US" l10n="E">
-<image id="img_id3146967" src="res/commandimagelist/sc_objects3dtoolbox.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146967" xml-lang="en-US">Icon</alt>
+<image id="img_id3146967" src="cmd/sc_objects3dtoolbox.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146967" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -80,7 +80,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149877" xml-lang="en-US" l10n="E">
-<image id="img_id3149884" src="res/commandimagelist/sc_objects3dtoolbox.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149884" xml-lang="en-US">Icon</alt>
+<image id="img_id3149884" src="cmd/sc_objects3dtoolbox.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149884" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -97,7 +97,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155985" xml-lang="en-US" l10n="E">
-<image id="img_id3155992" src="res/commandimagelist/sc_sphere.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155992" xml-lang="en-US">Icon</alt>
+<image id="img_id3155992" src="cmd/sc_sphere.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155992" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -114,7 +114,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3147562" xml-lang="en-US" l10n="E">
-<image id="img_id3147569" src="res/commandimagelist/sc_cylinder.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147569" xml-lang="en-US">Icon</alt>
+<image id="img_id3147569" src="cmd/sc_cylinder.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147569" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -131,7 +131,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3151172" xml-lang="en-US" l10n="E">
-<image id="img_id3151178" src="res/commandimagelist/sc_cone.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151178" xml-lang="en-US">Icon</alt>
+<image id="img_id3151178" src="cmd/sc_cone.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151178" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -148,7 +148,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3152941" xml-lang="en-US" l10n="E">
-<image id="img_id3152948" src="res/commandimagelist/sc_cyramid.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152948" xml-lang="en-US">Icon</alt>
+<image id="img_id3152948" src="cmd/sc_cyramid.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152948" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -165,7 +165,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3151312" xml-lang="en-US" l10n="E">
-<image id="img_id3151319" src="res/commandimagelist/sc_torus.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151319" xml-lang="en-US">Icon</alt>
+<image id="img_id3151319" src="cmd/sc_torus.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151319" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -182,7 +182,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155904" xml-lang="en-US" l10n="E">
-<image id="img_id3150838" src="res/commandimagelist/sc_shell3d.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150838" xml-lang="en-US">Icon</alt>
+<image id="img_id3150838" src="cmd/sc_shell3d.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150838" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -199,7 +199,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149310" xml-lang="en-US" l10n="E">
-<image id="img_id3151328" src="res/commandimagelist/sc_halfsphere.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151328" xml-lang="en-US">Icon</alt>
+<image id="img_id3151328" src="cmd/sc_halfsphere.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151328" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/02/10100000.xhp b/helpcontent2/source/text/simpress/02/10100000.xhp
index a799f18a61..2865f0722d 100644
--- a/helpcontent2/source/text/simpress/02/10100000.xhp
+++ b/helpcontent2/source/text/simpress/02/10100000.xhp
@@ -46,7 +46,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3155445" xml-lang="en-US" l10n="E">
-<image id="img_id3149018" src="res/commandimagelist/sc_connector.png" width="0.423cm" height="0.423cm"><alt id="alt_id3149018" xml-lang="en-US">Icon</alt>
+<image id="img_id3149018" src="cmd/sc_connector.png" width="0.423cm" height="0.423cm"><alt id="alt_id3149018" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -83,7 +83,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150743" xml-lang="en-US" l10n="E">
-<image id="img_id3153037" src="res/commandimagelist/sc_connector.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153037" xml-lang="en-US">Icon</alt>
+<image id="img_id3153037" src="cmd/sc_connector.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153037" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -100,7 +100,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3155930" xml-lang="en-US" l10n="E">
-<image id="img_id3150021" src="res/commandimagelist/sc_connectorarrowstart.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150021" xml-lang="en-US">Icon</alt>
+<image id="img_id3150021" src="cmd/sc_connectorarrowstart.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150021" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -117,7 +117,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150930" xml-lang="en-US" l10n="E">
-<image id="img_id3150936" src="res/commandimagelist/sc_connectorarrowend.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150936" xml-lang="en-US">Icon</alt>
+<image id="img_id3150936" src="cmd/sc_connectorarrowend.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150936" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -134,7 +134,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3155987" xml-lang="en-US" l10n="E">
-<image id="img_id3153720" src="res/commandimagelist/sc_connectorarrows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153720" xml-lang="en-US">Icon</alt>
+<image id="img_id3153720" src="cmd/sc_connectorarrows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153720" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -151,7 +151,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3147565" xml-lang="en-US" l10n="E">
-<image id="img_id3147572" src="res/commandimagelist/sc_connectorcirclestart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3147572" xml-lang="en-US">Icon</alt>
+<image id="img_id3147572" src="cmd/sc_connectorcirclestart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3147572" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -168,7 +168,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3143234" xml-lang="en-US" l10n="E">
-<image id="img_id3149289" src="res/commandimagelist/sc_connectorcircleend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3149289" xml-lang="en-US">Icon</alt>
+<image id="img_id3149289" src="cmd/sc_connectorcircleend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3149289" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -185,7 +185,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3158400" xml-lang="en-US" l10n="E">
-<image id="img_id3154203" src="res/commandimagelist/sc_connectortoolbox.png" width="0.566cm" height="0.566cm"><alt id="alt_id3154203" xml-lang="en-US">Icon</alt>
+<image id="img_id3154203" src="cmd/sc_connectortoolbox.png" width="0.566cm" height="0.566cm"><alt id="alt_id3154203" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -202,7 +202,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150705" xml-lang="en-US" l10n="E">
-<image id="img_id3153679" src="res/commandimagelist/sc_connectorlines.png" width="0.566cm" height="0.566cm"><alt id="alt_id3153679" xml-lang="en-US">Icon</alt>
+<image id="img_id3153679" src="cmd/sc_connectorlines.png" width="0.566cm" height="0.566cm"><alt id="alt_id3153679" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -219,7 +219,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3154610" xml-lang="en-US" l10n="E">
-<image id="img_id3150629" src="res/commandimagelist/sc_connectorlinesarrowstart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3150629" xml-lang="en-US">Icon</alt>
+<image id="img_id3150629" src="cmd/sc_connectorlinesarrowstart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3150629" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -236,7 +236,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150347" xml-lang="en-US" l10n="E">
-<image id="img_id3150357" src="res/commandimagelist/sc_connectorlinesarrowend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3150357" xml-lang="en-US">Icon</alt>
+<image id="img_id3150357" src="cmd/sc_connectorlinesarrowend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3150357" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -253,7 +253,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150972" xml-lang="en-US" l10n="E">
-<image id="img_id3150982" src="res/commandimagelist/sc_connectorlinesarrows.png" width="0.566cm" height="0.566cm"><alt id="alt_id3150982" xml-lang="en-US">Icon</alt>
+<image id="img_id3150982" src="cmd/sc_connectorlinesarrows.png" width="0.566cm" height="0.566cm"><alt id="alt_id3150982" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -270,7 +270,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3151274" xml-lang="en-US" l10n="E">
-<image id="img_id3151284" src="res/commandimagelist/sc_connectorlinescirclestart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3151284" xml-lang="en-US">Icon</alt>
+<image id="img_id3151284" src="cmd/sc_connectorlinescirclestart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3151284" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -287,7 +287,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="E">
-<image id="img_id3151326" src="res/commandimagelist/sc_connectorlinescircleend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3151326" xml-lang="en-US">Icon</alt>
+<image id="img_id3151326" src="cmd/sc_connectorlinescircleend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3151326" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -304,7 +304,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3151262" xml-lang="en-US" l10n="E">
-<image id="img_id3154834" src="res/commandimagelist/sc_connectorlinecircles.png" width="0.566cm" height="0.566cm"><alt id="alt_id3154834" xml-lang="en-US">Icon</alt>
+<image id="img_id3154834" src="cmd/sc_connectorlinecircles.png" width="0.566cm" height="0.566cm"><alt id="alt_id3154834" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -321,7 +321,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3148981" xml-lang="en-US" l10n="E">
-<image id="img_id3154223" src="res/commandimagelist/sc_connectorline.png" width="0.566cm" height="0.566cm"><alt id="alt_id3154223" xml-lang="en-US">Icon</alt>
+<image id="img_id3154223" src="cmd/sc_connectorline.png" width="0.566cm" height="0.566cm"><alt id="alt_id3154223" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -338,7 +338,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3152775" xml-lang="en-US" l10n="E">
-<image id="img_id3156188" src="res/commandimagelist/sc_connectorlinearrowstart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3156188" xml-lang="en-US">Icon</alt>
+<image id="img_id3156188" src="cmd/sc_connectorlinearrowstart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3156188" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -355,7 +355,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3147072" xml-lang="en-US" l10n="E">
-<image id="img_id3147082" src="res/commandimagelist/sc_connectorlinearrowend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3147082" xml-lang="en-US">Icon</alt>
+<image id="img_id3147082" src="cmd/sc_connectorlinearrowend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3147082" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -372,7 +372,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3151027" xml-lang="en-US" l10n="E">
-<image id="img_id3151037" src="res/commandimagelist/sc_connectorlinearrows.png" width="0.566cm" height="0.566cm"><alt id="alt_id3151037" xml-lang="en-US">Icon</alt>
+<image id="img_id3151037" src="cmd/sc_connectorlinearrows.png" width="0.566cm" height="0.566cm"><alt id="alt_id3151037" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -389,7 +389,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3156370" xml-lang="en-US" l10n="E">
-<image id="img_id3156380" src="res/commandimagelist/sc_connectorlinecirclestart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3156380" xml-lang="en-US">Icon</alt>
+<image id="img_id3156380" src="cmd/sc_connectorlinecirclestart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3156380" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -406,7 +406,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3155912" xml-lang="en-US" l10n="E">
-<image id="img_id3155922" src="res/commandimagelist/sc_connectorlinecircleend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3155922" xml-lang="en-US">Icon</alt>
+<image id="img_id3155922" src="cmd/sc_connectorlinecircleend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3155922" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -423,7 +423,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150112" xml-lang="en-US" l10n="E">
-<image id="img_id3150122" src="res/commandimagelist/sc_connectorlinecircles.png" width="0.566cm" height="0.566cm"><alt id="alt_id3150122" xml-lang="en-US">Icon</alt>
+<image id="img_id3150122" src="cmd/sc_connectorlinecircles.png" width="0.566cm" height="0.566cm"><alt id="alt_id3150122" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -440,7 +440,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3146139" xml-lang="en-US" l10n="E">
-<image id="img_id3146149" src="res/commandimagelist/sc_connectorcurve.png" width="0.566cm" height="0.566cm"><alt id="alt_id3146149" xml-lang="en-US">Icon</alt>
+<image id="img_id3146149" src="cmd/sc_connectorcurve.png" width="0.566cm" height="0.566cm"><alt id="alt_id3146149" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -457,7 +457,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3146914" xml-lang="en-US" l10n="E">
-<image id="img_id3154807" src="res/commandimagelist/sc_connectorcurvearrowstart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3154807" xml-lang="en-US">Icon</alt>
+<image id="img_id3154807" src="cmd/sc_connectorcurvearrowstart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3154807" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -474,7 +474,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3145215" xml-lang="en-US" l10n="E">
-<image id="img_id3145225" src="res/commandimagelist/sc_connectorcurvearrowend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3145225" xml-lang="en-US">Icon</alt>
+<image id="img_id3145225" src="cmd/sc_connectorcurvearrowend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3145225" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -491,7 +491,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3148438" xml-lang="en-US" l10n="E">
-<image id="img_id3148448" src="res/commandimagelist/sc_connectorcurvearrows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3148448" xml-lang="en-US">Icon</alt>
+<image id="img_id3148448" src="cmd/sc_connectorcurvearrows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3148448" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -508,7 +508,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3153291" xml-lang="en-US" l10n="E">
-<image id="img_id3153301" src="res/commandimagelist/sc_connectorcurvecirclestart.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153301" xml-lang="en-US">Icon</alt>
+<image id="img_id3153301" src="cmd/sc_connectorcurvecirclestart.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153301" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -525,7 +525,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3154724" xml-lang="en-US" l10n="E">
-<image id="img_id3156097" src="res/commandimagelist/sc_connectorcurvecircleend.png" width="0.423cm" height="0.423cm"><alt id="alt_id3156097" xml-lang="en-US">Icon</alt>
+<image id="img_id3156097" src="cmd/sc_connectorcurvecircleend.png" width="0.423cm" height="0.423cm"><alt id="alt_id3156097" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -542,7 +542,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3155588" xml-lang="en-US" l10n="E">
-<image id="img_id3155598" src="res/commandimagelist/sc_connectorcurvecircles.png" width="0.423cm" height="0.423cm"><alt id="alt_id3155598" xml-lang="en-US">Icon</alt>
+<image id="img_id3155598" src="cmd/sc_connectorcurvecircles.png" width="0.423cm" height="0.423cm"><alt id="alt_id3155598" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/simpress/02/10110000.xhp b/helpcontent2/source/text/simpress/02/10110000.xhp
index 810c82f13f..cec98f8e6d 100644
--- a/helpcontent2/source/text/simpress/02/10110000.xhp
+++ b/helpcontent2/source/text/simpress/02/10110000.xhp
@@ -49,7 +49,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154766" xml-lang="en-US" l10n="E">
-<image id="img_id3153812" src="res/commandimagelist/sc_drawchart.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153812" xml-lang="en-US">Icon</alt>
+<image id="img_id3153812" src="cmd/sc_drawchart.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153812" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/02/10120000.xhp b/helpcontent2/source/text/simpress/02/10120000.xhp
index adcc9a9da0..754bf2b234 100644
--- a/helpcontent2/source/text/simpress/02/10120000.xhp
+++ b/helpcontent2/source/text/simpress/02/10120000.xhp
@@ -57,7 +57,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3147405" xml-lang="en-US" l10n="E">
-<image id="img_id3147299" src="res/commandimagelist/sc_line.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147299" xml-lang="en-US">Icon</alt>
+<image id="img_id3147299" src="cmd/sc_line.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147299" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -72,7 +72,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145590" xml-lang="en-US" l10n="E">
-<image id="img_id3145596" src="res/commandimagelist/sc_arrowstoolbox.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145596" xml-lang="en-US">Icon</alt>
+<image id="img_id3145596" src="cmd/sc_arrowstoolbox.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145596" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -87,7 +87,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3156060" xml-lang="en-US" l10n="E">
-<image id="img_id3156066" src="res/commandimagelist/sc_linearrowcircle.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156066" xml-lang="en-US">Icon</alt>
+<image id="img_id3156066" src="cmd/sc_linearrowcircle.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156066" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -102,7 +102,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155402" xml-lang="en-US" l10n="E">
-<image id="img_id3155409" src="res/commandimagelist/sc_linearrowsquare.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155409" xml-lang="en-US">Icon</alt>
+<image id="img_id3155409" src="cmd/sc_linearrowsquare.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155409" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -117,7 +117,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145202" xml-lang="en-US" l10n="E">
-<image id="img_id3145209" src="res/commandimagelist/sc_line_diagonal.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145209" xml-lang="en-US">Icon</alt>
+<image id="img_id3145209" src="cmd/sc_line_diagonal.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145209" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -132,7 +132,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3151172" xml-lang="en-US" l10n="E">
-<image id="img_id3151178" src="res/commandimagelist/sc_linearrowstart.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151178" xml-lang="en-US">Icon</alt>
+<image id="img_id3151178" src="cmd/sc_linearrowstart.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151178" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -147,7 +147,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154276" xml-lang="en-US" l10n="E">
-<image id="img_id3149152" src="res/commandimagelist/sc_linecirclearrow.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149152" xml-lang="en-US">Icon</alt>
+<image id="img_id3149152" src="cmd/sc_linecirclearrow.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149152" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -162,7 +162,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153538" xml-lang="en-US" l10n="E">
-<image id="img_id3149931" src="res/commandimagelist/sc_linesquarearrow.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149931" xml-lang="en-US">Icon</alt>
+<image id="img_id3149931" src="cmd/sc_linesquarearrow.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149931" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -181,7 +181,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154836" xml-lang="en-US" l10n="E">
-<image id="img_id3149684" src="res/commandimagelist/sc_measureline.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149684" xml-lang="en-US">Icon</alt>
+<image id="img_id3149684" src="cmd/sc_measureline.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149684" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -197,7 +197,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3147218" xml-lang="en-US" l10n="E">
-<image id="img_id3147224" src="res/commandimagelist/sc_linearrows.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147224" xml-lang="en-US">Icon</alt>
+<image id="img_id3147224" src="cmd/sc_linearrows.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147224" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/02/11060000.xhp b/helpcontent2/source/text/simpress/02/11060000.xhp
index aeb626fa27..4ae15bfa61 100644
--- a/helpcontent2/source/text/simpress/02/11060000.xhp
+++ b/helpcontent2/source/text/simpress/02/11060000.xhp
@@ -52,7 +52,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3154702" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_outlinecollapseall.png" id="img_id3155336"><alt xml-lang="en-US" id="alt_id3155336">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3154702" xml-lang="en-US" oldref=""><image src="cmd/sc_outlinecollapseall.png" id="img_id3155336"><alt xml-lang="en-US" id="alt_id3155336">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3150207" l10n="U" xml-lang="en-US" oldref="3">First Level</paragraph>
diff --git a/helpcontent2/source/text/simpress/02/11070000.xhp b/helpcontent2/source/text/simpress/02/11070000.xhp
index f16dbb71b1..d4445507cf 100644
--- a/helpcontent2/source/text/simpress/02/11070000.xhp
+++ b/helpcontent2/source/text/simpress/02/11070000.xhp
@@ -52,7 +52,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3155333" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_outlineexpandall.png" id="img_id3154705"><alt xml-lang="en-US" id="alt_id3154705">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3155333" xml-lang="en-US" oldref=""><image src="cmd/sc_outlineexpandall.png" id="img_id3154705"><alt xml-lang="en-US" id="alt_id3154705">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3166424" l10n="U" xml-lang="en-US" oldref="3">All Levels</paragraph>
diff --git a/helpcontent2/source/text/simpress/02/11080000.xhp b/helpcontent2/source/text/simpress/02/11080000.xhp
index 7694747425..a94e8636e0 100644
--- a/helpcontent2/source/text/simpress/02/11080000.xhp
+++ b/helpcontent2/source/text/simpress/02/11080000.xhp
@@ -52,7 +52,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3155961" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_outlinecollapse.png" id="img_id3149256"><alt xml-lang="en-US" id="alt_id3149256">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3155961" xml-lang="en-US" oldref=""><image src="cmd/sc_outlinecollapse.png" id="img_id3149256"><alt xml-lang="en-US" id="alt_id3149256">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3148489" l10n="U" xml-lang="en-US" oldref="3">Hide Subpoints</paragraph>
diff --git a/helpcontent2/source/text/simpress/02/11090000.xhp b/helpcontent2/source/text/simpress/02/11090000.xhp
index 9c3d3aff40..1bcac69b4c 100644
--- a/helpcontent2/source/text/simpress/02/11090000.xhp
+++ b/helpcontent2/source/text/simpress/02/11090000.xhp
@@ -52,7 +52,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3155959" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_outlineexpand.png" id="img_id3155336"><alt xml-lang="en-US" id="alt_id3155336">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3155959" xml-lang="en-US" oldref=""><image src="cmd/sc_outlineexpand.png" id="img_id3155336"><alt xml-lang="en-US" id="alt_id3155336">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3146314" l10n="U" xml-lang="en-US" oldref="3">Show Subpoints</paragraph>
diff --git a/helpcontent2/source/text/simpress/02/11100000.xhp b/helpcontent2/source/text/simpress/02/11100000.xhp
index a7fc411c7d..f4e4cb9094 100644
--- a/helpcontent2/source/text/simpress/02/11100000.xhp
+++ b/helpcontent2/source/text/simpress/02/11100000.xhp
@@ -53,7 +53,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3156382" xml-lang="en-US" l10n="E">
-<image id="img_id3154254" src="res/commandimagelist/sc_outlineformat.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3154254" xml-lang="en-US">Icon</alt>
+<image id="img_id3154254" src="cmd/sc_outlineformat.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3154254" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/02/11110000.xhp b/helpcontent2/source/text/simpress/02/11110000.xhp
index 0b3a0e8cf0..a6828b4da9 100644
--- a/helpcontent2/source/text/simpress/02/11110000.xhp
+++ b/helpcontent2/source/text/simpress/02/11110000.xhp
@@ -54,7 +54,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155335" xml-lang="en-US" l10n="E">
-<image id="img_id3154705" src="res/commandimagelist/sc_colorview.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154705" xml-lang="en-US">Icon</alt>
+<image id="img_id3154705" src="cmd/sc_colorview.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154705" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/02/13010000.xhp b/helpcontent2/source/text/simpress/02/13010000.xhp
index 8be7be04c8..a634a3da48 100644
--- a/helpcontent2/source/text/simpress/02/13010000.xhp
+++ b/helpcontent2/source/text/simpress/02/13010000.xhp
@@ -52,7 +52,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3153713" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_glueeditmode.png" id="img_id3154256"><alt xml-lang="en-US" id="alt_id3154256">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3153713" xml-lang="en-US" oldref=""><image src="cmd/sc_glueeditmode.png" id="img_id3154256"><alt xml-lang="en-US" id="alt_id3154256">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3147339" l10n="U" xml-lang="en-US" oldref="3">Glue Points</paragraph>
diff --git a/helpcontent2/source/text/simpress/02/13020000.xhp b/helpcontent2/source/text/simpress/02/13020000.xhp
index fa106d523e..8d70b33b9e 100644
--- a/helpcontent2/source/text/simpress/02/13020000.xhp
+++ b/helpcontent2/source/text/simpress/02/13020000.xhp
@@ -53,7 +53,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155066" xml-lang="en-US" l10n="E">
-<image id="img_id3153714" src="res/commandimagelist/sc_clickchangerotation.png" width="5.64mm" height="5.64mm"><alt id="alt_id3153714" xml-lang="en-US">Icon</alt>
+<image id="img_id3153714" src="cmd/sc_clickchangerotation.png" width="5.64mm" height="5.64mm"><alt id="alt_id3153714" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/02/13030000.xhp b/helpcontent2/source/text/simpress/02/13030000.xhp
index a5982ed0eb..bd01122511 100644
--- a/helpcontent2/source/text/simpress/02/13030000.xhp
+++ b/helpcontent2/source/text/simpress/02/13030000.xhp
@@ -53,7 +53,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154704" xml-lang="en-US" l10n="E">
-<image id="img_id3149129" src="res/commandimagelist/sc_animationmode.png" width="5.64mm" height="5.64mm"><alt id="alt_id3149129" xml-lang="en-US">Icon</alt>
+<image id="img_id3149129" src="cmd/sc_animationmode.png" width="5.64mm" height="5.64mm"><alt id="alt_id3149129" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/02/13040000.xhp b/helpcontent2/source/text/simpress/02/13040000.xhp
index ddd585392e..90d00ac139 100644
--- a/helpcontent2/source/text/simpress/02/13040000.xhp
+++ b/helpcontent2/source/text/simpress/02/13040000.xhp
@@ -54,7 +54,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153925" xml-lang="en-US" l10n="E">
-<image id="img_id3156262" src="res/commandimagelist/sc_animationeffects.png" width="5.64mm" height="5.64mm"><alt id="alt_id3156262" xml-lang="en-US">Icon</alt>
+<image id="img_id3156262" src="cmd/sc_animationeffects.png" width="5.64mm" height="5.64mm"><alt id="alt_id3156262" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/02/13050000.xhp b/helpcontent2/source/text/simpress/02/13050000.xhp
index f52bd3dbe7..8f5d43bcf3 100644
--- a/helpcontent2/source/text/simpress/02/13050000.xhp
+++ b/helpcontent2/source/text/simpress/02/13050000.xhp
@@ -54,7 +54,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149019" xml-lang="en-US" l10n="E">
-<image id="img_id3156385" src="res/commandimagelist/sc_helplinesvisible.png" width="4.23mm" height="4.23mm"><alt id="alt_id3156385" xml-lang="en-US">Icon</alt>
+<image id="img_id3156385" src="cmd/sc_helplinesvisible.png" width="4.23mm" height="4.23mm"><alt id="alt_id3156385" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/02/13060000.xhp b/helpcontent2/source/text/simpress/02/13060000.xhp
index 1f3289b9bf..96f70c4576 100644
--- a/helpcontent2/source/text/simpress/02/13060000.xhp
+++ b/helpcontent2/source/text/simpress/02/13060000.xhp
@@ -49,7 +49,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154756" xml-lang="en-US" l10n="E">
-<image id="img_id3147341" src="res/commandimagelist/sc_doubleclicktextedit.png" width="5.64mm" height="5.64mm"><alt id="alt_id3147341" xml-lang="en-US">Icon</alt>
+<image id="img_id3147341" src="cmd/sc_doubleclicktextedit.png" width="5.64mm" height="5.64mm"><alt id="alt_id3147341" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/02/13070000.xhp b/helpcontent2/source/text/simpress/02/13070000.xhp
index d55dfcfeeb..c1101bb533 100644
--- a/helpcontent2/source/text/simpress/02/13070000.xhp
+++ b/helpcontent2/source/text/simpress/02/13070000.xhp
@@ -52,7 +52,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3153711" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_handlesdraft.png" id="img_id3149018"><alt xml-lang="en-US" id="alt_id3149018">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3153711" xml-lang="en-US" oldref=""><image src="cmd/sc_handlesdraft.png" id="img_id3149018"><alt xml-lang="en-US" id="alt_id3149018">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3149255" l10n="U" xml-lang="en-US" oldref="4">Simple Handles</paragraph>
diff --git a/helpcontent2/source/text/simpress/02/13080000.xhp b/helpcontent2/source/text/simpress/02/13080000.xhp
index 3bb4af5230..da895c7a8f 100644
--- a/helpcontent2/source/text/simpress/02/13080000.xhp
+++ b/helpcontent2/source/text/simpress/02/13080000.xhp
@@ -43,7 +43,7 @@
   <table id="tbl_id3150718">
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3155445" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_bighandles.png" id="img_id3153714"><alt xml-lang="en-US" id="alt_id3153714">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3155445" xml-lang="en-US" oldref=""><image src="cmd/sc_bighandles.png" id="img_id3153714"><alt xml-lang="en-US" id="alt_id3153714">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3154755" l10n="U" xml-lang="en-US" oldref="4">Large Handles</paragraph>
diff --git a/helpcontent2/source/text/simpress/02/13090000.xhp b/helpcontent2/source/text/simpress/02/13090000.xhp
index 94bd7a5a2b..1b0fcb6201 100644
--- a/helpcontent2/source/text/simpress/02/13090000.xhp
+++ b/helpcontent2/source/text/simpress/02/13090000.xhp
@@ -53,7 +53,7 @@
             <tablerow>
                <tablecell>
                   <paragraph xml-lang="en-US" id="par_id3154702" role="paragraph" l10n="E">
-<image id="img_id3155962" src="res/commandimagelist/sc_solidcreate.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155962">Icon</alt>
+<image id="img_id3155962" src="cmd/sc_solidcreate.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155962">Icon</alt>
 	</image></paragraph>
                </tablecell>
                <tablecell>
diff --git a/helpcontent2/source/text/simpress/02/13100000.xhp b/helpcontent2/source/text/simpress/02/13100000.xhp
index 55f6fd1381..ef8f9f2a76 100644
--- a/helpcontent2/source/text/simpress/02/13100000.xhp
+++ b/helpcontent2/source/text/simpress/02/13100000.xhp
@@ -52,7 +52,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3155443" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_leaveallgroups.png" id="img_id3154757"><alt xml-lang="en-US" id="alt_id3154757">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3155443" xml-lang="en-US" oldref=""><image src="cmd/sc_leaveallgroups.png" id="img_id3154757"><alt xml-lang="en-US" id="alt_id3154757">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3149019" l10n="U" xml-lang="en-US" oldref="3">Exit all groups</paragraph>
diff --git a/helpcontent2/source/text/simpress/02/13140000.xhp b/helpcontent2/source/text/simpress/02/13140000.xhp
index efe71e5006..c3feee6860 100644
--- a/helpcontent2/source/text/simpress/02/13140000.xhp
+++ b/helpcontent2/source/text/simpress/02/13140000.xhp
@@ -33,23 +33,23 @@
 <helpdocument version="1.0">
 <meta>
 <topic id="textsimpress0213140000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Snap to Guides</title>
+<title id="tit" xml-lang="en-US">Snap to Snap Lines</title>
 <filename>/text/simpress/02/13140000.xhp</filename>
 </topic>
 </meta>
 <body>
-<paragraph role="heading" id="hd_id3153726" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/simpress/02/13140000.xhp" name="Snap to Guides">Snap to Guides</link></paragraph>
+<paragraph role="heading" id="hd_id3153726" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/simpress/02/13140000.xhp" name="Snap to Snap Lines">Snap to Snap Lines</link></paragraph>
 <embed href="text/shared/optionen/01070300.xhp#anlinie"/>
 <section id="syanline">
 <table id="tbl_id3145799">
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150717" xml-lang="en-US" l10n="E">
-<image id="img_id3146969" src="res/commandimagelist/sc_helplinesuse.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3146969" xml-lang="en-US">Icon</alt>
+<image id="img_id3146969" src="cmd/sc_helplinesuse.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3146969" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154255" xml-lang="en-US" l10n="CHG" oldref="3">Snap to Guides</paragraph>
+<paragraph role="paragraph" id="par_id3154255" xml-lang="en-US" l10n="CHG" oldref="3">Snap to Snap Lines</paragraph>
 </tablecell>
 </tablerow>
 </table>
diff --git a/helpcontent2/source/text/simpress/02/13150000.xhp b/helpcontent2/source/text/simpress/02/13150000.xhp
index 1647f9d17a..3cc217361f 100644
--- a/helpcontent2/source/text/simpress/02/13150000.xhp
+++ b/helpcontent2/source/text/simpress/02/13150000.xhp
@@ -50,7 +50,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3150717" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_snapborder.png" id="img_id3154016"><alt xml-lang="en-US" id="alt_id3154016">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3150717" xml-lang="en-US" oldref=""><image src="cmd/sc_snapborder.png" id="img_id3154016"><alt xml-lang="en-US" id="alt_id3154016">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3156384" l10n="U" xml-lang="en-US" oldref="2">Snap to Page Margins</paragraph>
diff --git a/helpcontent2/source/text/simpress/02/13160000.xhp b/helpcontent2/source/text/simpress/02/13160000.xhp
index 0d02869b6f..90e98b7666 100644
--- a/helpcontent2/source/text/simpress/02/13160000.xhp
+++ b/helpcontent2/source/text/simpress/02/13160000.xhp
@@ -41,7 +41,7 @@
   <table id="tbl_id3159155">
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3150717" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_snapframe.png" id="img_id3154510"><alt xml-lang="en-US" id="alt_id3154510">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3150717" xml-lang="en-US" oldref=""><image src="cmd/sc_snapframe.png" id="img_id3154510"><alt xml-lang="en-US" id="alt_id3154510">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3154018" l10n="U" xml-lang="en-US" oldref="2">Snap to Object Border</paragraph>
diff --git a/helpcontent2/source/text/simpress/02/13170000.xhp b/helpcontent2/source/text/simpress/02/13170000.xhp
index a9db7cda63..345430a227 100644
--- a/helpcontent2/source/text/simpress/02/13170000.xhp
+++ b/helpcontent2/source/text/simpress/02/13170000.xhp
@@ -50,7 +50,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3154016" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_snappoints.png" id="img_id3153415"><alt xml-lang="en-US" id="alt_id3153415">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3154016" xml-lang="en-US" oldref=""><image src="cmd/sc_snappoints.png" id="img_id3153415"><alt xml-lang="en-US" id="alt_id3153415">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3148664" l10n="U" xml-lang="en-US" oldref="2">Snap to Object Points</paragraph>
diff --git a/helpcontent2/source/text/simpress/02/13180000.xhp b/helpcontent2/source/text/simpress/02/13180000.xhp
index c198608219..9af038c625 100644
--- a/helpcontent2/source/text/simpress/02/13180000.xhp
+++ b/helpcontent2/source/text/simpress/02/13180000.xhp
@@ -40,7 +40,7 @@
   <table id="tbl_id3125863">
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3149664" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_quickedit.png" id="img_id3153728"><alt xml-lang="en-US" id="alt_id3153728">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3149664" xml-lang="en-US" oldref=""><image src="cmd/sc_quickedit.png" id="img_id3153728"><alt xml-lang="en-US" id="alt_id3153728">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3146974" l10n="U" xml-lang="en-US" oldref="2">Allow Quick Editing</paragraph>
diff --git a/helpcontent2/source/text/simpress/02/13190000.xhp b/helpcontent2/source/text/simpress/02/13190000.xhp
index 98081c1c4e..618362a6d9 100644
--- a/helpcontent2/source/text/simpress/02/13190000.xhp
+++ b/helpcontent2/source/text/simpress/02/13190000.xhp
@@ -50,7 +50,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3154510" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_pickthrough.png" id="img_id3154015"><alt xml-lang="en-US" id="alt_id3154015">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3154510" xml-lang="en-US" oldref=""><image src="cmd/sc_pickthrough.png" id="img_id3154015"><alt xml-lang="en-US" id="alt_id3154015">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3154254" l10n="U" xml-lang="en-US" oldref="2">Select Text Area Only</paragraph>
diff --git a/helpcontent2/source/text/simpress/04/01020000.xhp b/helpcontent2/source/text/simpress/04/01020000.xhp
index 41e47ee8ea..41e47ee8ea 100755..100644
--- a/helpcontent2/source/text/simpress/04/01020000.xhp
+++ b/helpcontent2/source/text/simpress/04/01020000.xhp
diff --git a/helpcontent2/source/text/simpress/guide/3d_create.xhp b/helpcontent2/source/text/simpress/guide/3d_create.xhp
index 4e5e295947..0c9852131d 100755..100644
--- a/helpcontent2/source/text/simpress/guide/3d_create.xhp
+++ b/helpcontent2/source/text/simpress/guide/3d_create.xhp
@@ -103,13 +103,13 @@
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_idN1088B" xml-lang="en-US" l10n="NEW">Click the <emph>Extrusion On/Off</emph> icon
-<image id="img_id2490920" src="res/commandimagelist/sc_extrusiontoggle.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id2490920" xml-lang="en-US">Icon</alt>
+<image id="img_id2490920" src="cmd/sc_extrusiontoggle.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id2490920" xml-lang="en-US">Icon</alt>
 	</image> on the <emph>Drawing</emph> bar, or right-click the object and choose <emph>Convert - To 3D</emph>.</paragraph>
 </listitem>
 </list>
 <paragraph role="paragraph" id="par_id3148828" xml-lang="en-US" l10n="CHG" oldref="41">To edit the properties of the 3D object, use the <emph>Line and Filling</emph> toolbar and the <emph>3D Settings</emph> toolbar.</paragraph>
 <paragraph role="tip" id="par_idN108C5" xml-lang="en-US" l10n="NEW">To convert a text object to 3D, use the <emph>Fontwork</emph> icon
-<image id="img_id3821222" src="res/commandimagelist/sc_fontworkgalleryfloater.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3821222" xml-lang="en-US">Icon</alt>
+<image id="img_id3821222" src="cmd/sc_fontworkgalleryfloater.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3821222" xml-lang="en-US">Icon</alt>
 	</image> on the <emph>Drawing</emph> toolbar.</paragraph>
 <paragraph role="heading" id="hd_id3145410" xml-lang="en-US" level="3" l10n="U" oldref="65">To convert a 2D object to a 3D rotation object:</paragraph>
 <paragraph role="paragraph" id="par_id3154260" xml-lang="en-US" l10n="U" oldref="66">A 3D rotation object is created by rotating the selected object around its vertical axis.</paragraph>
diff --git a/helpcontent2/source/text/simpress/guide/animated_gif_save.xhp b/helpcontent2/source/text/simpress/guide/animated_gif_save.xhp
index 89c215fd96..89c215fd96 100755..100644
--- a/helpcontent2/source/text/simpress/guide/animated_gif_save.xhp
+++ b/helpcontent2/source/text/simpress/guide/animated_gif_save.xhp
diff --git a/helpcontent2/source/text/simpress/guide/animated_slidechange.xhp b/helpcontent2/source/text/simpress/guide/animated_slidechange.xhp
index e8f9cf54af..d7bee7302b 100644
--- a/helpcontent2/source/text/simpress/guide/animated_slidechange.xhp
+++ b/helpcontent2/source/text/simpress/guide/animated_slidechange.xhp
@@ -67,7 +67,7 @@
 <listitem>
 <paragraph role="paragraph" id="par_id3150263" xml-lang="en-US" l10n="CHG" oldref="48">In <emph>Slide Sorter</emph> view, select the slides that you want to add the transition effect to.</paragraph>
 <paragraph role="paragraph" id="par_id3148826" xml-lang="en-US" l10n="U" oldref="49">If you want, you can use the <emph>Zoom</emph> toolbar 
-<image id="img_id3151172" src="res/commandimagelist/sc_zoom.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151172" xml-lang="en-US">Icon</alt>
+<image id="img_id3151172" src="cmd/sc_zoom.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151172" xml-lang="en-US">Icon</alt>
 	</image> to change the view magnification for the slides.</paragraph>
 </listitem>
 <listitem>
diff --git a/helpcontent2/source/text/simpress/guide/change_scale.xhp b/helpcontent2/source/text/simpress/guide/change_scale.xhp
index ebfe030fe5..ebfe030fe5 100755..100644
--- a/helpcontent2/source/text/simpress/guide/change_scale.xhp
+++ b/helpcontent2/source/text/simpress/guide/change_scale.xhp
diff --git a/helpcontent2/source/text/simpress/guide/footer.xhp b/helpcontent2/source/text/simpress/guide/footer.xhp
index 82c8099265..eac0a4ca07 100644
--- a/helpcontent2/source/text/simpress/guide/footer.xhp
+++ b/helpcontent2/source/text/simpress/guide/footer.xhp
@@ -101,7 +101,7 @@
    </listitem>
    <listitem>
     <paragraph xml-lang="en-US" id="par_id3147295" role="paragraph" l10n="U" oldref="12">On the <emph>Drawing</emph> bar, select the <emph>Text</emph> icon 
-<image id="img_id3154654" src="res/commandimagelist/sc_texttoolbox.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3154654">Icon</alt>
+<image id="img_id3154654" src="cmd/sc_texttoolbox.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3154654">Icon</alt>
 	</image>.</paragraph>
    </listitem>
    <listitem>
diff --git a/helpcontent2/source/text/simpress/guide/html_export.xhp b/helpcontent2/source/text/simpress/guide/html_export.xhp
index 8dad212cb2..8dad212cb2 100755..100644
--- a/helpcontent2/source/text/simpress/guide/html_export.xhp
+++ b/helpcontent2/source/text/simpress/guide/html_export.xhp
diff --git a/helpcontent2/source/text/simpress/guide/html_import.xhp b/helpcontent2/source/text/simpress/guide/html_import.xhp
index 143fdcade5..143fdcade5 100755..100644
--- a/helpcontent2/source/text/simpress/guide/html_import.xhp
+++ b/helpcontent2/source/text/simpress/guide/html_import.xhp
diff --git a/helpcontent2/source/text/simpress/guide/individual.xhp b/helpcontent2/source/text/simpress/guide/individual.xhp
index 796c02053e..796c02053e 100755..100644
--- a/helpcontent2/source/text/simpress/guide/individual.xhp
+++ b/helpcontent2/source/text/simpress/guide/individual.xhp
diff --git a/helpcontent2/source/text/simpress/guide/layer_move.xhp b/helpcontent2/source/text/simpress/guide/layer_move.xhp
index 78559e293f..78559e293f 100755..100644
--- a/helpcontent2/source/text/simpress/guide/layer_move.xhp
+++ b/helpcontent2/source/text/simpress/guide/layer_move.xhp
diff --git a/helpcontent2/source/text/simpress/guide/layers.xhp b/helpcontent2/source/text/simpress/guide/layers.xhp
index 699b6920b8..699b6920b8 100755..100644
--- a/helpcontent2/source/text/simpress/guide/layers.xhp
+++ b/helpcontent2/source/text/simpress/guide/layers.xhp
diff --git a/helpcontent2/source/text/simpress/guide/line_arrow_styles.xhp b/helpcontent2/source/text/simpress/guide/line_arrow_styles.xhp
index 20b8e7c895..20b8e7c895 100755..100644
--- a/helpcontent2/source/text/simpress/guide/line_arrow_styles.xhp
+++ b/helpcontent2/source/text/simpress/guide/line_arrow_styles.xhp
diff --git a/helpcontent2/source/text/simpress/guide/line_draw.xhp b/helpcontent2/source/text/simpress/guide/line_draw.xhp
index 65d4082ff0..8284a351e9 100644
--- a/helpcontent2/source/text/simpress/guide/line_draw.xhp
+++ b/helpcontent2/source/text/simpress/guide/line_draw.xhp
@@ -51,7 +51,7 @@
 <paragraph role="heading" id="hd_id3149377" xml-lang="en-US" level="1" l10n="U" oldref="3"><variable id="line_draw"><link href="text/simpress/guide/line_draw.xhp" name="Drawing Curves">Drawing Curves</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3148868" xml-lang="en-US" l10n="CHG" oldref="4">The <emph>Curve</emph> icon 
-<image id="img_id3150205" src="res/commandimagelist/sc_linetoolbox.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150205" xml-lang="en-US">Icon</alt>
+<image id="img_id3150205" src="cmd/sc_linetoolbox.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150205" xml-lang="en-US">Icon</alt>
 	</image> on the <emph>Drawing</emph> toolbar opens a toolbar to draw Bézier curves. Bézier curves are defined by a start point and an end point, which are called "anchors". The curvature of the Bézier curve is defined by control points ("handles"). Moving a control point changes the shape of the Bézier curve.</paragraph>
 <paragraph role="note" id="par_id8532364" xml-lang="en-US" l10n="NEW">Control points are only visible in "Edit Points" mode. Control points are represented by circles, anchor points are represented by squares. The start point is a little bit larger than the other anchor points.</paragraph>
 <paragraph role="paragraph" id="par_id3150210" xml-lang="en-US" l10n="CHG" oldref="39">Bézier curve segments and straight line segments can be joined to form more complex Bézier curves. Three different transitions can be applied to join adjacent segments:</paragraph>
@@ -70,9 +70,9 @@
 <list type="ordered">
 <listitem>
 <paragraph role="paragraph" id="par_id3155262" xml-lang="en-US" l10n="CHG" oldref="5">On the Drawing toolbar, open the <emph>Curves</emph> toolbar 
-<image id="img_id3145829" src="res/commandimagelist/sc_linetoolbox.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145829" xml-lang="en-US">Icon</alt>
+<image id="img_id3145829" src="cmd/sc_linetoolbox.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145829" xml-lang="en-US">Icon</alt>
 	</image> and select the <emph>Curve</emph>
-<image id="Graphic1" src="res/commandimagelist/sc_bezier_unfilled.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt>
+<image id="Graphic1" src="cmd/sc_bezier_unfilled.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt>
 	</image> tool.</paragraph>
 </listitem>
 <listitem>
@@ -105,9 +105,9 @@
 <list type="ordered">
 <listitem>
 <paragraph role="paragraph" id="par_id4907681" xml-lang="en-US" l10n="NEW">On the Drawing toolbar, open the <emph>Curves</emph> toolbar 
-<image id="Graphic2" src="res/commandimagelist/sc_linetoolbox.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt>
+<image id="Graphic2" src="cmd/sc_linetoolbox.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt>
 	</image> and select the <emph>Freeform Line</emph>
-<image id="Graphic3" src="res/commandimagelist/sc_freeline_unfilled.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt>
+<image id="Graphic3" src="cmd/sc_freeline_unfilled.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt>
 	</image> tool.</paragraph>
 </listitem>
 <listitem>
diff --git a/helpcontent2/source/text/simpress/guide/line_edit.xhp b/helpcontent2/source/text/simpress/guide/line_edit.xhp
index 7de673fae1..d671a76cf1 100644
--- a/helpcontent2/source/text/simpress/guide/line_edit.xhp
+++ b/helpcontent2/source/text/simpress/guide/line_edit.xhp
@@ -55,7 +55,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153711" xml-lang="en-US" l10n="E">
-<image id="img_id3149018" src="res/commandimagelist/sc_toggleobjectbeziermode.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149018" xml-lang="en-US">Icon</alt>
+<image id="img_id3149018" src="cmd/sc_toggleobjectbeziermode.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149018" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/guide/main.xhp b/helpcontent2/source/text/simpress/guide/main.xhp
index c1dd2d6a9d..c1dd2d6a9d 100755..100644
--- a/helpcontent2/source/text/simpress/guide/main.xhp
+++ b/helpcontent2/source/text/simpress/guide/main.xhp
diff --git a/helpcontent2/source/text/simpress/guide/masterpage.xhp b/helpcontent2/source/text/simpress/guide/masterpage.xhp
index 8439972e85..8439972e85 100755..100644
--- a/helpcontent2/source/text/simpress/guide/masterpage.xhp
+++ b/helpcontent2/source/text/simpress/guide/masterpage.xhp
diff --git a/helpcontent2/source/text/simpress/guide/move_object.xhp b/helpcontent2/source/text/simpress/guide/move_object.xhp
index 225fba6aa4..225fba6aa4 100755..100644
--- a/helpcontent2/source/text/simpress/guide/move_object.xhp
+++ b/helpcontent2/source/text/simpress/guide/move_object.xhp
diff --git a/helpcontent2/source/text/simpress/guide/orgchart.xhp b/helpcontent2/source/text/simpress/guide/orgchart.xhp
index 7fd8e25081..7fd8e25081 100755..100644
--- a/helpcontent2/source/text/simpress/guide/orgchart.xhp
+++ b/helpcontent2/source/text/simpress/guide/orgchart.xhp
diff --git a/helpcontent2/source/text/simpress/guide/page_copy.xhp b/helpcontent2/source/text/simpress/guide/page_copy.xhp
index 9ea0d5b7c0..9ea0d5b7c0 100755..100644
--- a/helpcontent2/source/text/simpress/guide/page_copy.xhp
+++ b/helpcontent2/source/text/simpress/guide/page_copy.xhp
diff --git a/helpcontent2/source/text/simpress/guide/palette_files.xhp b/helpcontent2/source/text/simpress/guide/palette_files.xhp
index 8a7e6a92b2..6c442e0d3e 100755..100644
--- a/helpcontent2/source/text/simpress/guide/palette_files.xhp
+++ b/helpcontent2/source/text/simpress/guide/palette_files.xhp
@@ -63,9 +63,16 @@
 </listitem>
 </list>
 <paragraph role="paragraph" id="par_id3154762" xml-lang="en-US" l10n="U" oldref="77">To save a color list, click the <emph>Save Color List</emph> button, enter a filename, and then click <emph>Save</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3149871"><bookmark_value>colors; default colors</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3149871">
+<bookmark_value>colors; default colors</bookmark_value>
+<bookmark_value>colors; LibreOffice colors</bookmark_value>
+<bookmark_value>LibreOffice colors</bookmark_value>
+<bookmark_value>colors; Tango colors</bookmark_value>
+<bookmark_value>Tango colors</bookmark_value>
+<bookmark_value>colors; web</bookmark_value>
+<bookmark_value>colors; CMYK</bookmark_value>
 </bookmark>
-<paragraph role="paragraph" id="par_id3149871" xml-lang="en-US" l10n="U" oldref="71">The CMYK list is optimized for print colors, whereas the colors in the Web and the HTML lists are optimized for displays using a resolution of 256 colors.</paragraph>
+<paragraph role="paragraph" id="par_id3149871" xml-lang="en-US" l10n="U" oldref="71">The CMYK list is optimized for print colors. The colors in the Web and the HTML lists are optimized for displays using a resolution of 256 colors. The palettes libreoffice.soc and tango.soc contain the official LibreOffice and Tango colors respectively.</paragraph>
 <paragraph role="heading" id="hd_id3150435" xml-lang="en-US" level="3" l10n="U" oldref="78">To load a gradient list:</paragraph>
 <list type="ordered">
 <listitem>
diff --git a/helpcontent2/source/text/simpress/guide/print_tofit.xhp b/helpcontent2/source/text/simpress/guide/print_tofit.xhp
index 75748268f9..75748268f9 100755..100644
--- a/helpcontent2/source/text/simpress/guide/print_tofit.xhp
+++ b/helpcontent2/source/text/simpress/guide/print_tofit.xhp
diff --git a/helpcontent2/source/text/simpress/guide/printing.xhp b/helpcontent2/source/text/simpress/guide/printing.xhp
index fd1b6bb6a3..fd1b6bb6a3 100755..100644
--- a/helpcontent2/source/text/simpress/guide/printing.xhp
+++ b/helpcontent2/source/text/simpress/guide/printing.xhp
diff --git a/helpcontent2/source/text/simpress/guide/rehearse_timings.xhp b/helpcontent2/source/text/simpress/guide/rehearse_timings.xhp
index f1e045c192..88429b67c5 100644
--- a/helpcontent2/source/text/simpress/guide/rehearse_timings.xhp
+++ b/helpcontent2/source/text/simpress/guide/rehearse_timings.xhp
@@ -57,7 +57,7 @@
 </listitem>
 <listitem>
 <paragraph role="paragraph" id="par_id3150651" xml-lang="en-US" l10n="CHG" oldref="6">Start the show with the <emph>Rehearse Timings</emph> icon 
-<image id="img_id3156396" src="res/commandimagelist/sc_rehearsetimings.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156396" xml-lang="en-US">Icon</alt>
+<image id="img_id3156396" src="cmd/sc_rehearsetimings.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156396" xml-lang="en-US">Icon</alt>
 	</image> in the Slide View bar. You see the first slide, and a timer in the bottom corner.</paragraph>
 </listitem>
 <listitem>
diff --git a/helpcontent2/source/text/simpress/guide/select_object.xhp b/helpcontent2/source/text/simpress/guide/select_object.xhp
index 5bae78d335..5bae78d335 100755..100644
--- a/helpcontent2/source/text/simpress/guide/select_object.xhp
+++ b/helpcontent2/source/text/simpress/guide/select_object.xhp
diff --git a/helpcontent2/source/text/simpress/guide/text2curve.xhp b/helpcontent2/source/text/simpress/guide/text2curve.xhp
index 5496d400d8..5496d400d8 100755..100644
--- a/helpcontent2/source/text/simpress/guide/text2curve.xhp
+++ b/helpcontent2/source/text/simpress/guide/text2curve.xhp
diff --git a/helpcontent2/source/text/simpress/guide/vectorize.xhp b/helpcontent2/source/text/simpress/guide/vectorize.xhp
index 6009018fe3..6009018fe3 100755..100644
--- a/helpcontent2/source/text/simpress/guide/vectorize.xhp
+++ b/helpcontent2/source/text/simpress/guide/vectorize.xhp
diff --git a/helpcontent2/source/text/simpress/main0100.xhp b/helpcontent2/source/text/simpress/main0100.xhp
index 48ad1eede8..48ad1eede8 100755..100644
--- a/helpcontent2/source/text/simpress/main0100.xhp
+++ b/helpcontent2/source/text/simpress/main0100.xhp
diff --git a/helpcontent2/source/text/simpress/main0101.xhp b/helpcontent2/source/text/simpress/main0101.xhp
index 6dc10ab748..6dc10ab748 100755..100644
--- a/helpcontent2/source/text/simpress/main0101.xhp
+++ b/helpcontent2/source/text/simpress/main0101.xhp
diff --git a/helpcontent2/source/text/simpress/main0102.xhp b/helpcontent2/source/text/simpress/main0102.xhp
index 435801d61a..435801d61a 100755..100644
--- a/helpcontent2/source/text/simpress/main0102.xhp
+++ b/helpcontent2/source/text/simpress/main0102.xhp
diff --git a/helpcontent2/source/text/simpress/main0103.xhp b/helpcontent2/source/text/simpress/main0103.xhp
index 4100f89ea8..4100f89ea8 100755..100644
--- a/helpcontent2/source/text/simpress/main0103.xhp
+++ b/helpcontent2/source/text/simpress/main0103.xhp
diff --git a/helpcontent2/source/text/simpress/main0104.xhp b/helpcontent2/source/text/simpress/main0104.xhp
index 8ffbe17d17..8ffbe17d17 100755..100644
--- a/helpcontent2/source/text/simpress/main0104.xhp
+++ b/helpcontent2/source/text/simpress/main0104.xhp
diff --git a/helpcontent2/source/text/simpress/main0105.xhp b/helpcontent2/source/text/simpress/main0105.xhp
index 873985aa4a..873985aa4a 100755..100644
--- a/helpcontent2/source/text/simpress/main0105.xhp
+++ b/helpcontent2/source/text/simpress/main0105.xhp
diff --git a/helpcontent2/source/text/simpress/main0106.xhp b/helpcontent2/source/text/simpress/main0106.xhp
index 37b31e16ca..37b31e16ca 100755..100644
--- a/helpcontent2/source/text/simpress/main0106.xhp
+++ b/helpcontent2/source/text/simpress/main0106.xhp
diff --git a/helpcontent2/source/text/simpress/main0107.xhp b/helpcontent2/source/text/simpress/main0107.xhp
index dfc276ae24..dfc276ae24 100755..100644
--- a/helpcontent2/source/text/simpress/main0107.xhp
+++ b/helpcontent2/source/text/simpress/main0107.xhp
diff --git a/helpcontent2/source/text/simpress/main0113.xhp b/helpcontent2/source/text/simpress/main0113.xhp
index c2faf7b1e6..c2faf7b1e6 100755..100644
--- a/helpcontent2/source/text/simpress/main0113.xhp
+++ b/helpcontent2/source/text/simpress/main0113.xhp
diff --git a/helpcontent2/source/text/simpress/main0114.xhp b/helpcontent2/source/text/simpress/main0114.xhp
index 8a205ac6e3..8a205ac6e3 100755..100644
--- a/helpcontent2/source/text/simpress/main0114.xhp
+++ b/helpcontent2/source/text/simpress/main0114.xhp
diff --git a/helpcontent2/source/text/simpress/main0200.xhp b/helpcontent2/source/text/simpress/main0200.xhp
index 43bfdd6dca..43bfdd6dca 100755..100644
--- a/helpcontent2/source/text/simpress/main0200.xhp
+++ b/helpcontent2/source/text/simpress/main0200.xhp
diff --git a/helpcontent2/source/text/simpress/main0202.xhp b/helpcontent2/source/text/simpress/main0202.xhp
index 9358908c17..9358908c17 100755..100644
--- a/helpcontent2/source/text/simpress/main0202.xhp
+++ b/helpcontent2/source/text/simpress/main0202.xhp
diff --git a/helpcontent2/source/text/simpress/main0204.xhp b/helpcontent2/source/text/simpress/main0204.xhp
index 83510f28f1..83510f28f1 100755..100644
--- a/helpcontent2/source/text/simpress/main0204.xhp
+++ b/helpcontent2/source/text/simpress/main0204.xhp
diff --git a/helpcontent2/source/text/simpress/main0206.xhp b/helpcontent2/source/text/simpress/main0206.xhp
index 1a4554622a..1a4554622a 100755..100644
--- a/helpcontent2/source/text/simpress/main0206.xhp
+++ b/helpcontent2/source/text/simpress/main0206.xhp
diff --git a/helpcontent2/source/text/simpress/main0210.xhp b/helpcontent2/source/text/simpress/main0210.xhp
index 86de5a1b46..86de5a1b46 100755..100644
--- a/helpcontent2/source/text/simpress/main0210.xhp
+++ b/helpcontent2/source/text/simpress/main0210.xhp
diff --git a/helpcontent2/source/text/simpress/main0211.xhp b/helpcontent2/source/text/simpress/main0211.xhp
index 9b30d2a386..9b30d2a386 100755..100644
--- a/helpcontent2/source/text/simpress/main0211.xhp
+++ b/helpcontent2/source/text/simpress/main0211.xhp
diff --git a/helpcontent2/source/text/simpress/main0212.xhp b/helpcontent2/source/text/simpress/main0212.xhp
index 6a9b8b4a40..6a9b8b4a40 100755..100644
--- a/helpcontent2/source/text/simpress/main0212.xhp
+++ b/helpcontent2/source/text/simpress/main0212.xhp
diff --git a/helpcontent2/source/text/simpress/main0213.xhp b/helpcontent2/source/text/simpress/main0213.xhp
index b267487725..bee46bbe47 100755..100644
--- a/helpcontent2/source/text/simpress/main0213.xhp
+++ b/helpcontent2/source/text/simpress/main0213.xhp
@@ -53,13 +53,13 @@
 <embed href="text/shared/02/01171200.xhp#syrastsicht"/>
 <embed href="text/simpress/02/13050000.xhp#hilfslinsicht"/>
 <embed href="text/simpress/02/13050000.xhp#hilfsicht"/>
-<paragraph role="heading" id="hd_id3148700" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/shared/02/01171400.xhp" name="Guides When Moving">Guides When Moving</link></paragraph>
+<paragraph role="heading" id="hd_id3148700" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/shared/02/01171400.xhp" name="Helplines While Moving">Helplines While Moving</link></paragraph>
 <embed href="text/shared/optionen/01070100.xhp#verschieb"/>
 <embed href="text/shared/02/01171400.xhp#syhline"/>
 <paragraph role="heading" id="hd_id3149603" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/shared/02/01171300.xhp" name="Snap to Grid">Snap to Grid</link></paragraph>
 <embed href="text/shared/optionen/01050100.xhp#rasterfang"/>
 <embed href="text/shared/02/01171300.xhp#syrafang"/>
-<paragraph role="heading" id="hd_id3143233" xml-lang="en-US" level="2" l10n="CHG" oldref="6"><link href="text/simpress/02/13140000.xhp" name="Snap to Guides">Snap to Guides</link></paragraph>
+<paragraph role="heading" id="hd_id3143233" xml-lang="en-US" level="2" l10n="CHG" oldref="6"><link href="text/simpress/02/13140000.xhp" name="Snap to Snap Lines">Snap to Snap Lines</link></paragraph>
 <embed href="text/shared/optionen/01070300.xhp#anlinie"/>
 <embed href="text/simpress/02/13140000.xhp#syanline"/>
 <paragraph role="heading" id="hd_id3146966" xml-lang="en-US" level="2" l10n="U" oldref="7"><link href="text/simpress/02/13150000.xhp" name="Snap to Page Margins">Snap to Page Margins</link></paragraph>
diff --git a/helpcontent2/source/text/simpress/main0214.xhp b/helpcontent2/source/text/simpress/main0214.xhp
index 8b6d450324..8b6d450324 100755..100644
--- a/helpcontent2/source/text/simpress/main0214.xhp
+++ b/helpcontent2/source/text/simpress/main0214.xhp
diff --git a/helpcontent2/source/text/simpress/main0503.xhp b/helpcontent2/source/text/simpress/main0503.xhp
index 50bbee1d17..50bbee1d17 100755..100644
--- a/helpcontent2/source/text/simpress/main0503.xhp
+++ b/helpcontent2/source/text/simpress/main0503.xhp
diff --git a/helpcontent2/source/text/smath/00/00000004.xhp b/helpcontent2/source/text/smath/00/00000004.xhp
index e291246b26..c79ab8554f 100644
--- a/helpcontent2/source/text/smath/00/00000004.xhp
+++ b/helpcontent2/source/text/smath/00/00000004.xhp
@@ -68,7 +68,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154653" xml-lang="en-US" l10n="E">
-<image id="img_id3154765" src="res/commandimagelist/sc_zoom100percent.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3154765" xml-lang="en-US">Icon</alt>
+<image id="img_id3154765" src="cmd/sc_zoom100percent.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3154765" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -86,7 +86,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150743" xml-lang="en-US" l10n="E">
-<image id="img_id3163822" src="res/commandimagelist/sc_helpzoomin.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3163822" xml-lang="en-US">Icon</alt>
+<image id="img_id3163822" src="cmd/sc_helpzoomin.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3163822" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -105,7 +105,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150934" xml-lang="en-US" l10n="E">
-<image id="img_id3148387" src="res/commandimagelist/sc_zoomminus.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148387" xml-lang="en-US">Icon</alt>
+<image id="img_id3148387" src="cmd/sc_zoomminus.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148387" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -124,7 +124,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3151265" xml-lang="en-US" l10n="E">
-<image id="img_id3151272" src="res/commandimagelist/sc_zoom.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3151272" xml-lang="en-US">Icon</alt>
+<image id="img_id3151272" src="cmd/sc_zoom.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3151272" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -144,7 +144,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3147260" xml-lang="en-US" l10n="E">
-<image id="img_id3151168" src="res/commandimagelist/sc_refresh.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3151168" xml-lang="en-US">Icon</alt>
+<image id="img_id3151168" src="cmd/sc_refresh.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3151168" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -315,7 +315,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153258" xml-lang="en-US" l10n="E">
-<image id="img_id3153264" src="res/commandimagelist/sc_autosum.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153264" xml-lang="en-US">Icon</alt>
+<image id="img_id3153264" src="cmd/sc_autosum.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153264" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -353,7 +353,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145626" xml-lang="en-US" l10n="E">
-<image id="img_id3145632" src="res/commandimagelist/sc_formelcursor.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145632" xml-lang="en-US">Icon</alt>
+<image id="img_id3145632" src="cmd/sc_formelcursor.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145632" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/smath/01/03090600.xhp b/helpcontent2/source/text/smath/01/03090600.xhp
index c5e008e40f..0fc877c2b1 100644
--- a/helpcontent2/source/text/smath/01/03090600.xhp
+++ b/helpcontent2/source/text/smath/01/03090600.xhp
@@ -372,7 +372,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_idN104E1" role="paragraph" l10n="F">
-<image id="img_id3153240" src="res/commandimagelist/sc_bold.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3153240">Icon</alt>
+<image id="img_id3153240" src="cmd/sc_bold.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3153240">Icon</alt>
 	</image></paragraph>
 <bookmark xml-lang="en-US" branch="hid/STARMATH_HID_SMA_BOLDX" id="bm_id3146954" localize="false"/>
 </tablecell>
@@ -387,7 +387,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_idN1051C" role="paragraph" l10n="F">
-<image id="img_id3150038" src="res/commandimagelist/sc_italic.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150038">Icon</alt>
+<image id="img_id3150038" src="cmd/sc_italic.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150038">Icon</alt>
 	</image></paragraph>
 <bookmark xml-lang="en-US" branch="hid/STARMATH_HID_SMA_ITALX" id="bm_id3150034" localize="false"/>
 </tablecell>
@@ -402,7 +402,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_idN1055A" role="paragraph" l10n="F">
-<image id="img_id3155801" src="res/commandimagelist/sc_fontheight.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3155801">Icon</alt>
+<image id="img_id3155801" src="cmd/sc_fontheight.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3155801">Icon</alt>
 	</image></paragraph>
 <bookmark xml-lang="en-US" branch="hid/STARMATH_HID_SMA_SIZEXY" id="bm_id3155798" localize="false"/>
 </tablecell>
@@ -417,7 +417,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_idN10595" role="paragraph" l10n="F">
-<image id="img_id3148804" src="res/commandimagelist/sc_charfontname.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3148804">Icon</alt>
+<image id="img_id3148804" src="cmd/sc_charfontname.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3148804">Icon</alt>
 	</image></paragraph>
 <bookmark xml-lang="en-US" branch="hid/STARMATH_HID_SMA_FONTXY" id="bm_id3154349" localize="false"/>
 </tablecell>
diff --git a/helpcontent2/source/text/smath/01/03090900.xhp b/helpcontent2/source/text/smath/01/03090900.xhp
index 359a635eb9..359a635eb9 100755..100644
--- a/helpcontent2/source/text/smath/01/03090900.xhp
+++ b/helpcontent2/source/text/smath/01/03090900.xhp
diff --git a/helpcontent2/source/text/smath/01/03091506.xhp b/helpcontent2/source/text/smath/01/03091506.xhp
index 9aee16bdbe..c5bc455698 100644
--- a/helpcontent2/source/text/smath/01/03091506.xhp
+++ b/helpcontent2/source/text/smath/01/03091506.xhp
@@ -94,7 +94,7 @@
 </tablecell>
 <tablecell colspan="" rowspan="">
 <paragraph role="tablecontent" id="par_id3161361" xml-lang="en-US" l10n="E">
-<image id="img_id3161367" src="res/commandimagelist/sc_bold.png" width="0.222inch" height="0.222inch"><alt id="alt_id3161367" xml-lang="en-US">Icon</alt>
+<image id="img_id3161367" src="cmd/sc_bold.png" width="0.222inch" height="0.222inch"><alt id="alt_id3161367" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -242,7 +242,7 @@
 </tablecell>
 <tablecell colspan="" rowspan="">
 <paragraph role="tablecontent" id="par_id3161469" xml-lang="en-US" l10n="E">
-<image id="img_id3161476" src="res/commandimagelist/sc_italic.png" width="0.222inch" height="0.222inch"><alt id="alt_id3161476" xml-lang="en-US">Icon</alt>
+<image id="img_id3161476" src="cmd/sc_italic.png" width="0.222inch" height="0.222inch"><alt id="alt_id3161476" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/smath/01/05010100.xhp b/helpcontent2/source/text/smath/01/05010100.xhp
index ce7ed3dafa..ce7ed3dafa 100755..100644
--- a/helpcontent2/source/text/smath/01/05010100.xhp
+++ b/helpcontent2/source/text/smath/01/05010100.xhp
diff --git a/helpcontent2/source/text/smath/04/01020000.xhp b/helpcontent2/source/text/smath/04/01020000.xhp
index 960ac98a88..960ac98a88 100755..100644
--- a/helpcontent2/source/text/smath/04/01020000.xhp
+++ b/helpcontent2/source/text/smath/04/01020000.xhp
diff --git a/helpcontent2/source/text/smath/guide/align.xhp b/helpcontent2/source/text/smath/guide/align.xhp
index 10387acf1a..10387acf1a 100755..100644
--- a/helpcontent2/source/text/smath/guide/align.xhp
+++ b/helpcontent2/source/text/smath/guide/align.xhp
diff --git a/helpcontent2/source/text/smath/guide/attributes.xhp b/helpcontent2/source/text/smath/guide/attributes.xhp
index 512bbf9131..512bbf9131 100755..100644
--- a/helpcontent2/source/text/smath/guide/attributes.xhp
+++ b/helpcontent2/source/text/smath/guide/attributes.xhp
diff --git a/helpcontent2/source/text/smath/guide/brackets.xhp b/helpcontent2/source/text/smath/guide/brackets.xhp
index e3723f7c8d..e3723f7c8d 100755..100644
--- a/helpcontent2/source/text/smath/guide/brackets.xhp
+++ b/helpcontent2/source/text/smath/guide/brackets.xhp
diff --git a/helpcontent2/source/text/smath/guide/comment.xhp b/helpcontent2/source/text/smath/guide/comment.xhp
index 8bc3789f34..8bc3789f34 100755..100644
--- a/helpcontent2/source/text/smath/guide/comment.xhp
+++ b/helpcontent2/source/text/smath/guide/comment.xhp
diff --git a/helpcontent2/source/text/smath/guide/keyboard.xhp b/helpcontent2/source/text/smath/guide/keyboard.xhp
index a3b8a86969..a3b8a86969 100755..100644
--- a/helpcontent2/source/text/smath/guide/keyboard.xhp
+++ b/helpcontent2/source/text/smath/guide/keyboard.xhp
diff --git a/helpcontent2/source/text/smath/guide/main.xhp b/helpcontent2/source/text/smath/guide/main.xhp
index cd310067f0..cd310067f0 100755..100644
--- a/helpcontent2/source/text/smath/guide/main.xhp
+++ b/helpcontent2/source/text/smath/guide/main.xhp
diff --git a/helpcontent2/source/text/smath/guide/newline.xhp b/helpcontent2/source/text/smath/guide/newline.xhp
index 50ffae97c3..50ffae97c3 100755..100644
--- a/helpcontent2/source/text/smath/guide/newline.xhp
+++ b/helpcontent2/source/text/smath/guide/newline.xhp
diff --git a/helpcontent2/source/text/smath/guide/parentheses.xhp b/helpcontent2/source/text/smath/guide/parentheses.xhp
index 94e2a47e09..94e2a47e09 100755..100644
--- a/helpcontent2/source/text/smath/guide/parentheses.xhp
+++ b/helpcontent2/source/text/smath/guide/parentheses.xhp
diff --git a/helpcontent2/source/text/smath/main0000.xhp b/helpcontent2/source/text/smath/main0000.xhp
index 54ffcfdf75..54ffcfdf75 100755..100644
--- a/helpcontent2/source/text/smath/main0000.xhp
+++ b/helpcontent2/source/text/smath/main0000.xhp
diff --git a/helpcontent2/source/text/smath/main0100.xhp b/helpcontent2/source/text/smath/main0100.xhp
index 1bac982b0c..1bac982b0c 100755..100644
--- a/helpcontent2/source/text/smath/main0100.xhp
+++ b/helpcontent2/source/text/smath/main0100.xhp
diff --git a/helpcontent2/source/text/smath/main0101.xhp b/helpcontent2/source/text/smath/main0101.xhp
index 941c2e03df..941c2e03df 100755..100644
--- a/helpcontent2/source/text/smath/main0101.xhp
+++ b/helpcontent2/source/text/smath/main0101.xhp
diff --git a/helpcontent2/source/text/smath/main0102.xhp b/helpcontent2/source/text/smath/main0102.xhp
index 4950168673..4950168673 100755..100644
--- a/helpcontent2/source/text/smath/main0102.xhp
+++ b/helpcontent2/source/text/smath/main0102.xhp
diff --git a/helpcontent2/source/text/smath/main0103.xhp b/helpcontent2/source/text/smath/main0103.xhp
index 19a0a16582..19a0a16582 100755..100644
--- a/helpcontent2/source/text/smath/main0103.xhp
+++ b/helpcontent2/source/text/smath/main0103.xhp
diff --git a/helpcontent2/source/text/smath/main0105.xhp b/helpcontent2/source/text/smath/main0105.xhp
index 70cba9a288..70cba9a288 100755..100644
--- a/helpcontent2/source/text/smath/main0105.xhp
+++ b/helpcontent2/source/text/smath/main0105.xhp
diff --git a/helpcontent2/source/text/smath/main0106.xhp b/helpcontent2/source/text/smath/main0106.xhp
index 559a9aa9cd..559a9aa9cd 100755..100644
--- a/helpcontent2/source/text/smath/main0106.xhp
+++ b/helpcontent2/source/text/smath/main0106.xhp
diff --git a/helpcontent2/source/text/smath/main0107.xhp b/helpcontent2/source/text/smath/main0107.xhp
index 4ca311955d..4ca311955d 100755..100644
--- a/helpcontent2/source/text/smath/main0107.xhp
+++ b/helpcontent2/source/text/smath/main0107.xhp
diff --git a/helpcontent2/source/text/smath/main0200.xhp b/helpcontent2/source/text/smath/main0200.xhp
index 81e470b128..81e470b128 100755..100644
--- a/helpcontent2/source/text/smath/main0200.xhp
+++ b/helpcontent2/source/text/smath/main0200.xhp
diff --git a/helpcontent2/source/text/smath/main0202.xhp b/helpcontent2/source/text/smath/main0202.xhp
index c22d57a0ba..c22d57a0ba 100755..100644
--- a/helpcontent2/source/text/smath/main0202.xhp
+++ b/helpcontent2/source/text/smath/main0202.xhp
diff --git a/helpcontent2/source/text/smath/main0203.xhp b/helpcontent2/source/text/smath/main0203.xhp
index e3c7b88122..e3c7b88122 100755..100644
--- a/helpcontent2/source/text/smath/main0203.xhp
+++ b/helpcontent2/source/text/smath/main0203.xhp
diff --git a/helpcontent2/source/text/swriter/00/00000004.xhp b/helpcontent2/source/text/swriter/00/00000004.xhp
index bfe12de562..5093965d98 100644
--- a/helpcontent2/source/text/swriter/00/00000004.xhp
+++ b/helpcontent2/source/text/swriter/00/00000004.xhp
@@ -48,7 +48,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3150253" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_wrapoff.png" id="img_id3145389"><alt xml-lang="en-US" id="alt_id3145389">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3150253" xml-lang="en-US" oldref=""><image src="cmd/sc_wrapoff.png" id="img_id3145389"><alt xml-lang="en-US" id="alt_id3145389">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3150211" l10n="U" xml-lang="en-US" oldref="230">Wrap Off</paragraph>
@@ -64,7 +64,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3156397" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_wrapon.png" id="img_id3149048"><alt xml-lang="en-US" id="alt_id3149048">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3156397" xml-lang="en-US" oldref=""><image src="cmd/sc_wrapon.png" id="img_id3149048"><alt xml-lang="en-US" id="alt_id3149048">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3147299" l10n="U" xml-lang="en-US" oldref="231">Wrap On</paragraph>
@@ -80,7 +80,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3154558" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_wrapthrough.png" id="img_id3152999"><alt xml-lang="en-US" id="alt_id3152999">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3154558" xml-lang="en-US" oldref=""><image src="cmd/sc_wrapthrough.png" id="img_id3152999"><alt xml-lang="en-US" id="alt_id3152999">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3153738" l10n="U" xml-lang="en-US" oldref="232">Wrap Through</paragraph>
diff --git a/helpcontent2/source/text/swriter/00/00000401.xhp b/helpcontent2/source/text/swriter/00/00000401.xhp
index 19da980be8..343024e083 100644
--- a/helpcontent2/source/text/swriter/00/00000401.xhp
+++ b/helpcontent2/source/text/swriter/00/00000401.xhp
@@ -61,7 +61,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3083448" xml-lang="en-US" l10n="E">
-<image id="img_id3083452" src="res/commandimagelist/sc_mergedialog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3083452" xml-lang="en-US">Icon</alt>
+<image id="img_id3083452" src="cmd/sc_mergedialog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3083452" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/swriter/00/00000402.xhp b/helpcontent2/source/text/swriter/00/00000402.xhp
index e107a9f5ea..683613df97 100644
--- a/helpcontent2/source/text/swriter/00/00000402.xhp
+++ b/helpcontent2/source/text/swriter/00/00000402.xhp
@@ -52,7 +52,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149048" xml-lang="en-US" l10n="E">
-<image id="img_id3156418" src="res/commandimagelist/sc_editglossary.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3156418" xml-lang="en-US">Icon</alt>
+<image id="img_id3156418" src="cmd/sc_editglossary.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3156418" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/swriter/00/00000403.xhp b/helpcontent2/source/text/swriter/00/00000403.xhp
index d0fc9fe5ae..c03a13bbfd 100644
--- a/helpcontent2/source/text/swriter/00/00000403.xhp
+++ b/helpcontent2/source/text/swriter/00/00000403.xhp
@@ -66,7 +66,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3150932" role="paragraph" l10n="E">
-<image id="img_id3150502" src="res/commandimagelist/sc_controlcodes.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3150502">Icon</alt>
+<image id="img_id3150502" src="cmd/sc_controlcodes.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3150502">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -86,7 +86,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3150765" role="paragraph" l10n="E">
-<image id="img_id3147572" src="res/commandimagelist/sc_browseview.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3147572">Icon</alt>
+<image id="img_id3147572" src="cmd/sc_browseview.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3147572">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
diff --git a/helpcontent2/source/text/swriter/00/00000404.xhp b/helpcontent2/source/text/swriter/00/00000404.xhp
index 8d876282fc..ea8615aa58 100644
--- a/helpcontent2/source/text/swriter/00/00000404.xhp
+++ b/helpcontent2/source/text/swriter/00/00000404.xhp
@@ -71,7 +71,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150760" xml-lang="en-US" l10n="E">
-<image id="img_id3146959" src="res/commandimagelist/sc_insertfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3146959" xml-lang="en-US">Icon</alt>
+<image id="img_id3146959" src="cmd/sc_insertfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3146959" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -106,7 +106,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3154569" xml-lang="en-US" l10n="E">
-<image id="img_id3152952" src="res/commandimagelist/sc_insertsection.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152952" xml-lang="en-US">Icon</alt>
+<image id="img_id3152952" src="cmd/sc_insertsection.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152952" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -131,7 +131,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3151261" xml-lang="en-US" l10n="E">
-<image id="img_id3149099" src="res/commandimagelist/sc_insertfootnote.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149099" xml-lang="en-US">Icon</alt>
+<image id="img_id3149099" src="cmd/sc_insertfootnote.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149099" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -147,7 +147,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3147579" xml-lang="en-US" l10n="E">
-<image id="img_id3147586" src="res/commandimagelist/sc_insertendnote.png" width="0.2228in" height="0.2228in"><alt id="alt_id3147586" xml-lang="en-US">Icon</alt>
+<image id="img_id3147586" src="cmd/sc_insertendnote.png" width="0.2228in" height="0.2228in"><alt id="alt_id3147586" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -202,7 +202,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3145131" xml-lang="en-US" l10n="E">
-<image id="img_id3149551" src="res/commandimagelist/sc_insertindexesentry.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149551" xml-lang="en-US">Icon</alt>
+<image id="img_id3149551" src="cmd/sc_insertindexesentry.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149551" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -279,7 +279,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3149372" xml-lang="en-US" l10n="E">
-<image id="img_id3149379" src="res/commandimagelist/sc_insertframe.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149379" xml-lang="en-US">Icon</alt>
+<image id="img_id3149379" src="cmd/sc_insertframe.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149379" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -301,7 +301,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3154620" xml-lang="en-US" l10n="E">
-<image id="img_id3154627" src="res/commandimagelist/sc_grid.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154627" xml-lang="en-US">Icon</alt>
+<image id="img_id3154627" src="cmd/sc_grid.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154627" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -323,7 +323,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3149959" xml-lang="en-US" l10n="E">
-<image id="img_id3149966" src="res/commandimagelist/sc_insertdoc.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149966" xml-lang="en-US">Icon</alt>
+<image id="img_id3149966" src="cmd/sc_insertdoc.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149966" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/swriter/00/00000405.xhp b/helpcontent2/source/text/swriter/00/00000405.xhp
index 02108cc6af..ff92fbe1bd 100644
--- a/helpcontent2/source/text/swriter/00/00000405.xhp
+++ b/helpcontent2/source/text/swriter/00/00000405.xhp
@@ -114,7 +114,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3150557" role="paragraph" l10n="E">
-<image id="img_id3149214" src="res/commandimagelist/sc_framedialog.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3149214">Icon</alt>
+<image id="img_id3149214" src="cmd/sc_framedialog.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3149214">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -186,7 +186,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3153996" role="paragraph" l10n="E">
-<image id="img_id3154002" src="res/commandimagelist/sc_mergecells.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3154002">Icon</alt>
+<image id="img_id3154002" src="cmd/sc_mergecells.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3154002">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -206,7 +206,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3147270" role="paragraph" l10n="E">
-<image id="img_id3147275" src="res/commandimagelist/sc_splitcell.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3147275">Icon</alt>
+<image id="img_id3147275" src="cmd/sc_splitcell.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3147275">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -237,7 +237,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3145222" role="paragraph" l10n="E">
-<image id="img_id3145228" src="res/commandimagelist/sc_setoptimalrowheight.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3145228">Icon</alt>
+<image id="img_id3145228" src="cmd/sc_setoptimalrowheight.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3145228">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -257,7 +257,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3145297" role="paragraph" l10n="E">
-<image id="img_id3155994" src="res/commandimagelist/sc_distributerows.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3155994">Icon</alt>
+<image id="img_id3155994" src="cmd/sc_distributerows.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3155994">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -279,7 +279,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3147555" role="paragraph" l10n="E">
-<image id="img_id3150361" src="res/commandimagelist/sc_deleterows.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150361">Icon</alt>
+<image id="img_id3150361" src="cmd/sc_deleterows.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150361">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -303,7 +303,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3157881" role="paragraph" l10n="E">
-<image id="img_id3157888" src="res/commandimagelist/sc_setoptimalcolumnwidthdirect.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3157888">Icon</alt>
+<image id="img_id3157888" src="cmd/sc_setoptimalcolumnwidthdirect.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3157888">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -323,7 +323,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3145179" role="paragraph" l10n="E">
-<image id="img_id3145186" src="res/commandimagelist/sc_distributecolumns.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3145186">Icon</alt>
+<image id="img_id3145186" src="cmd/sc_distributecolumns.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3145186">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -346,7 +346,7 @@
             <tablerow>
                <tablecell>
                   <paragraph xml-lang="en-US" id="par_id3150279" role="paragraph" l10n="E">
-<image id="img_id3150286" src="res/commandimagelist/sc_insertcolumns.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150286">Icon</alt>
+<image id="img_id3150286" src="cmd/sc_insertcolumns.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150286">Icon</alt>
 	</image></paragraph>
                </tablecell>
                <tablecell>
@@ -356,7 +356,7 @@
             <tablerow>
                <tablecell>
                   <paragraph xml-lang="en-US" id="par_id3150895" role="paragraph" l10n="E">
-<image id="img_id3150902" src="res/commandimagelist/sc_insertrows.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150902">Icon</alt>
+<image id="img_id3150902" src="cmd/sc_insertrows.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3150902">Icon</alt>
 	</image></paragraph>
                </tablecell>
                <tablecell>
@@ -375,7 +375,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3153600" role="paragraph" l10n="E">
-<image id="img_id3153607" src="res/commandimagelist/sc_deletecolumns.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3153607">Icon</alt>
+<image id="img_id3153607" src="cmd/sc_deletecolumns.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3153607">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -394,7 +394,7 @@
                <tablerow>
                   <tablecell>
                      <paragraph xml-lang="en-US" id="par_id3151276" role="paragraph" l10n="E">
-<image id="img_id3151283" src="res/commandimagelist/sc_framedialog.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3151283">Icon</alt>
+<image id="img_id3151283" src="cmd/sc_framedialog.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3151283">Icon</alt>
 	</image></paragraph>
                   </tablecell>
                   <tablecell>
@@ -410,7 +410,7 @@
             <tablerow>
                <tablecell>
                   <paragraph xml-lang="en-US" id="par_id3152973" role="paragraph" l10n="E">
-<image id="img_id3152980" src="res/commandimagelist/sc_framedialog.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3152980">Icon</alt>
+<image id="img_id3152980" src="cmd/sc_framedialog.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3152980">Icon</alt>
 	</image></paragraph>
                </tablecell>
                <tablecell>
diff --git a/helpcontent2/source/text/swriter/00/00000406.xhp b/helpcontent2/source/text/swriter/00/00000406.xhp
index 1d1bf19943..9277b5cda3 100755..100644
--- a/helpcontent2/source/text/swriter/00/00000406.xhp
+++ b/helpcontent2/source/text/swriter/00/00000406.xhp
@@ -92,7 +92,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_idN10806" xml-lang="en-US" l10n="NEW">
-<image id="img_id3083452" src="res/commandimagelist/sc_mergedialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3083452" xml-lang="en-US">Icon</alt>
+<image id="img_id3083452" src="cmd/sc_mergedialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3083452" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/swriter/01/02110000.xhp b/helpcontent2/source/text/swriter/01/02110000.xhp
index 5ecd531f1d..d7d2d3f49b 100644
--- a/helpcontent2/source/text/swriter/01/02110000.xhp
+++ b/helpcontent2/source/text/swriter/01/02110000.xhp
@@ -47,7 +47,7 @@
 <section id="howtoget">
 <embed href="text/shared/00/00000402.xhp#navigator"/>
 </section>
-<paragraph role="paragraph" id="par_id3154475" xml-lang="en-US" l10n="CHG" oldref="3">To open the Navigator, choose <emph>View - Navigator</emph>. To move the Navigator, drag its title bar. To dock the Navigator, drag its title bar to the left or to the right edge of the workspace. To undock the Navigator, double-click in a free area of the Navigator.</paragraph>
+<paragraph role="paragraph" id="par_id3154475" xml-lang="en-US" l10n="CHG" oldref="3">To open the Navigator, choose <emph>View - Navigator</emph>. To move the Navigator, drag its title bar. To dock the Navigator, drag its title bar to the left or to the right edge of the workspace. To undock the Navigator, hold down the Ctrl key and double-click on a grey area of the Navigator.</paragraph>
 <paragraph role="paragraph" id="par_id3149490" xml-lang="en-US" l10n="CHG" oldref="79">Click the plus sign (+) next to a category in the Navigator to view the items in the category. To view the number of items in a category, rest your mouse pointer over the category in the Navigator. To jump to an item in the document, double-click the item in the Navigator.</paragraph>
 <paragraph role="paragraph" id="par_id3149106" xml-lang="en-US" l10n="CHG" oldref="64">To jump to the next or previous item in a document, click the <link href="text/swriter/01/02110100.xhp" name="Navigation">Navigation</link> icon to open the Navigation toolbar, click the item category, and then click the up or down arrows.</paragraph>
 <paragraph role="note" id="par_id3155136" xml-lang="en-US" l10n="U" oldref="90">A hidden section in a document appears gray in the Navigator, and displays the text "hidden" when you rest the mouse pointer over it. The same applies to header and footer contents of Page Styles that are not used in a document, and hidden contents in tables, text frames, graphics, OLE objects, and indexes.</paragraph>
@@ -225,7 +225,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3155120" xml-lang="en-US" l10n="E">
-<image id="img_id3155126" src="res/commandimagelist/sc_chainframes.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155126" xml-lang="en-US">Icon</alt>
+<image id="img_id3155126" src="cmd/sc_chainframes.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155126" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/swriter/01/02120100.xhp b/helpcontent2/source/text/swriter/01/02120100.xhp
index c350b0b49c..c350b0b49c 100755..100644
--- a/helpcontent2/source/text/swriter/01/02120100.xhp
+++ b/helpcontent2/source/text/swriter/01/02120100.xhp
diff --git a/helpcontent2/source/text/swriter/01/02160000.xhp b/helpcontent2/source/text/swriter/01/02160000.xhp
index 140ec0431d..334de1de24 100644
--- a/helpcontent2/source/text/swriter/01/02160000.xhp
+++ b/helpcontent2/source/text/swriter/01/02160000.xhp
@@ -105,7 +105,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3148785" xml-lang="en-US" l10n="E">
-<image id="img_id3148791" src="res/commandimagelist/sc_prevrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148791" xml-lang="en-US">Icon</alt>
+<image id="img_id3148791" src="cmd/sc_prevrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148791" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/swriter/01/04020200.xhp b/helpcontent2/source/text/swriter/01/04020200.xhp
index 2541c5759d..2541c5759d 100755..100644
--- a/helpcontent2/source/text/swriter/01/04020200.xhp
+++ b/helpcontent2/source/text/swriter/01/04020200.xhp
diff --git a/helpcontent2/source/text/swriter/01/04060100.xhp b/helpcontent2/source/text/swriter/01/04060100.xhp
index 03bbab141e..03bbab141e 100755..100644
--- a/helpcontent2/source/text/swriter/01/04060100.xhp
+++ b/helpcontent2/source/text/swriter/01/04060100.xhp
diff --git a/helpcontent2/source/text/swriter/01/04090007.xhp b/helpcontent2/source/text/swriter/01/04090007.xhp
index 68220aee01..68220aee01 100755..100644
--- a/helpcontent2/source/text/swriter/01/04090007.xhp
+++ b/helpcontent2/source/text/swriter/01/04090007.xhp
diff --git a/helpcontent2/source/text/swriter/01/04120000.xhp b/helpcontent2/source/text/swriter/01/04120000.xhp
index 08ccf733c9..08ccf733c9 100755..100644
--- a/helpcontent2/source/text/swriter/01/04120000.xhp
+++ b/helpcontent2/source/text/swriter/01/04120000.xhp
diff --git a/helpcontent2/source/text/swriter/01/04120201.xhp b/helpcontent2/source/text/swriter/01/04120201.xhp
index 7553d5d77b..7553d5d77b 100755..100644
--- a/helpcontent2/source/text/swriter/01/04120201.xhp
+++ b/helpcontent2/source/text/swriter/01/04120201.xhp
diff --git a/helpcontent2/source/text/swriter/01/04120210.xhp b/helpcontent2/source/text/swriter/01/04120210.xhp
index 8ef51fb4a5..8ef51fb4a5 100755..100644
--- a/helpcontent2/source/text/swriter/01/04120210.xhp
+++ b/helpcontent2/source/text/swriter/01/04120210.xhp
diff --git a/helpcontent2/source/text/swriter/01/04120212.xhp b/helpcontent2/source/text/swriter/01/04120212.xhp
index 40d2a4133d..40d2a4133d 100755..100644
--- a/helpcontent2/source/text/swriter/01/04120212.xhp
+++ b/helpcontent2/source/text/swriter/01/04120212.xhp
diff --git a/helpcontent2/source/text/swriter/01/04120213.xhp b/helpcontent2/source/text/swriter/01/04120213.xhp
index 79574821ee..79574821ee 100755..100644
--- a/helpcontent2/source/text/swriter/01/04120213.xhp
+++ b/helpcontent2/source/text/swriter/01/04120213.xhp
diff --git a/helpcontent2/source/text/swriter/01/04120214.xhp b/helpcontent2/source/text/swriter/01/04120214.xhp
index 51e6d1050a..51e6d1050a 100755..100644
--- a/helpcontent2/source/text/swriter/01/04120214.xhp
+++ b/helpcontent2/source/text/swriter/01/04120214.xhp
diff --git a/helpcontent2/source/text/swriter/01/04120215.xhp b/helpcontent2/source/text/swriter/01/04120215.xhp
index 283b15a984..283b15a984 100755..100644
--- a/helpcontent2/source/text/swriter/01/04120215.xhp
+++ b/helpcontent2/source/text/swriter/01/04120215.xhp
diff --git a/helpcontent2/source/text/swriter/01/04120217.xhp b/helpcontent2/source/text/swriter/01/04120217.xhp
index b0853bd77f..b0853bd77f 100755..100644
--- a/helpcontent2/source/text/swriter/01/04120217.xhp
+++ b/helpcontent2/source/text/swriter/01/04120217.xhp
diff --git a/helpcontent2/source/text/swriter/01/04120222.xhp b/helpcontent2/source/text/swriter/01/04120222.xhp
index 68d4f2a89a..68d4f2a89a 100755..100644
--- a/helpcontent2/source/text/swriter/01/04120222.xhp
+++ b/helpcontent2/source/text/swriter/01/04120222.xhp
diff --git a/helpcontent2/source/text/swriter/01/04120223.xhp b/helpcontent2/source/text/swriter/01/04120223.xhp
index bc5295ea11..bc5295ea11 100755..100644
--- a/helpcontent2/source/text/swriter/01/04120223.xhp
+++ b/helpcontent2/source/text/swriter/01/04120223.xhp
diff --git a/helpcontent2/source/text/swriter/01/04120224.xhp b/helpcontent2/source/text/swriter/01/04120224.xhp
index 3ad4b73813..3ad4b73813 100755..100644
--- a/helpcontent2/source/text/swriter/01/04120224.xhp
+++ b/helpcontent2/source/text/swriter/01/04120224.xhp
diff --git a/helpcontent2/source/text/swriter/01/04120225.xhp b/helpcontent2/source/text/swriter/01/04120225.xhp
index 84c365d467..84c365d467 100755..100644
--- a/helpcontent2/source/text/swriter/01/04120225.xhp
+++ b/helpcontent2/source/text/swriter/01/04120225.xhp
diff --git a/helpcontent2/source/text/swriter/01/04120226.xhp b/helpcontent2/source/text/swriter/01/04120226.xhp
index 98c9296c33..98c9296c33 100755..100644
--- a/helpcontent2/source/text/swriter/01/04120226.xhp
+++ b/helpcontent2/source/text/swriter/01/04120226.xhp
diff --git a/helpcontent2/source/text/swriter/01/04120227.xhp b/helpcontent2/source/text/swriter/01/04120227.xhp
index a320696dc9..a320696dc9 100755..100644
--- a/helpcontent2/source/text/swriter/01/04120227.xhp
+++ b/helpcontent2/source/text/swriter/01/04120227.xhp
diff --git a/helpcontent2/source/text/swriter/01/04130100.xhp b/helpcontent2/source/text/swriter/01/04130100.xhp
index d2decbf782..d2decbf782 100755..100644
--- a/helpcontent2/source/text/swriter/01/04130100.xhp
+++ b/helpcontent2/source/text/swriter/01/04130100.xhp
diff --git a/helpcontent2/source/text/swriter/01/04990000.xhp b/helpcontent2/source/text/swriter/01/04990000.xhp
index 06df5429c2..06df5429c2 100755..100644
--- a/helpcontent2/source/text/swriter/01/04990000.xhp
+++ b/helpcontent2/source/text/swriter/01/04990000.xhp
diff --git a/helpcontent2/source/text/swriter/01/05040501.xhp b/helpcontent2/source/text/swriter/01/05040501.xhp
index 53d0a3eabd..53d0a3eabd 100755..100644
--- a/helpcontent2/source/text/swriter/01/05040501.xhp
+++ b/helpcontent2/source/text/swriter/01/05040501.xhp
diff --git a/helpcontent2/source/text/swriter/01/05040800.xhp b/helpcontent2/source/text/swriter/01/05040800.xhp
index f59dabfd5f..f59dabfd5f 100755..100644
--- a/helpcontent2/source/text/swriter/01/05040800.xhp
+++ b/helpcontent2/source/text/swriter/01/05040800.xhp
diff --git a/helpcontent2/source/text/swriter/01/05060201.xhp b/helpcontent2/source/text/swriter/01/05060201.xhp
index 1e24f54aa5..a45babf9e1 100644
--- a/helpcontent2/source/text/swriter/01/05060201.xhp
+++ b/helpcontent2/source/text/swriter/01/05060201.xhp
@@ -90,7 +90,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3151370" xml-lang="en-US" l10n="E">
-<image id="img_id3151377" src="res/commandimagelist/sc_drawselect.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151377" xml-lang="en-US">Icon</alt>
+<image id="img_id3151377" src="cmd/sc_drawselect.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151377" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -106,7 +106,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149559" xml-lang="en-US" l10n="E">
-<image id="img_id3149565" src="res/commandimagelist/sc_rect.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149565" xml-lang="en-US">Icon</alt>
+<image id="img_id3149565" src="cmd/sc_rect.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149565" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -122,7 +122,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3146332" xml-lang="en-US" l10n="E">
-<image id="img_id3146338" src="res/commandimagelist/sc_ellipse.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146338" xml-lang="en-US">Icon</alt>
+<image id="img_id3146338" src="cmd/sc_ellipse.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146338" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -138,7 +138,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145304" xml-lang="en-US" l10n="E">
-<image id="img_id3145311" src="res/commandimagelist/sc_polygon.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145311" xml-lang="en-US">Icon</alt>
+<image id="img_id3145311" src="cmd/sc_polygon.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145311" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -154,7 +154,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154711" xml-lang="en-US" l10n="E">
-<image id="img_id3154717" src="res/commandimagelist/sc_toggleobjectbeziermode.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154717" xml-lang="en-US">Icon</alt>
+<image id="img_id3154717" src="cmd/sc_toggleobjectbeziermode.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154717" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -170,7 +170,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3146940" xml-lang="en-US" l10n="E">
-<image id="img_id3146947" src="res/commandimagelist/sc_beziermove.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146947" xml-lang="en-US">Icon</alt>
+<image id="img_id3146947" src="cmd/sc_beziermove.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146947" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -186,7 +186,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149357" xml-lang="en-US" l10n="E">
-<image id="img_id3149363" src="res/commandimagelist/sc_bezierinsert.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149363" xml-lang="en-US">Icon</alt>
+<image id="img_id3149363" src="cmd/sc_bezierinsert.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149363" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -202,7 +202,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149637" xml-lang="en-US" l10n="E">
-<image id="img_id3149643" src="res/commandimagelist/sc_bezierdelete.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149643" xml-lang="en-US">Icon</alt>
+<image id="img_id3149643" src="cmd/sc_bezierdelete.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149643" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -250,7 +250,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154058" xml-lang="en-US" l10n="E">
-<image id="img_id3154073" src="res/commandimagelist/sc_redo.png" width="0.2228inch" height="0.2228inch"><alt id="alt_id3154073" xml-lang="en-US">Icon</alt>
+<image id="img_id3154073" src="cmd/sc_redo.png" width="0.2228inch" height="0.2228inch"><alt id="alt_id3154073" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/swriter/01/05090200.xhp b/helpcontent2/source/text/swriter/01/05090200.xhp
index 360fea6ac9..360fea6ac9 100755..100644
--- a/helpcontent2/source/text/swriter/01/05090200.xhp
+++ b/helpcontent2/source/text/swriter/01/05090200.xhp
diff --git a/helpcontent2/source/text/swriter/01/05100000.xhp b/helpcontent2/source/text/swriter/01/05100000.xhp
index e847d829d0..e847d829d0 100755..100644
--- a/helpcontent2/source/text/swriter/01/05100000.xhp
+++ b/helpcontent2/source/text/swriter/01/05100000.xhp
diff --git a/helpcontent2/source/text/swriter/01/05110000.xhp b/helpcontent2/source/text/swriter/01/05110000.xhp
index 8b89c48407..8b89c48407 100755..100644
--- a/helpcontent2/source/text/swriter/01/05110000.xhp
+++ b/helpcontent2/source/text/swriter/01/05110000.xhp
diff --git a/helpcontent2/source/text/swriter/01/05120000.xhp b/helpcontent2/source/text/swriter/01/05120000.xhp
index e899a99204..e899a99204 100755..100644
--- a/helpcontent2/source/text/swriter/01/05120000.xhp
+++ b/helpcontent2/source/text/swriter/01/05120000.xhp
diff --git a/helpcontent2/source/text/swriter/01/05130002.xhp b/helpcontent2/source/text/swriter/01/05130002.xhp
index b599def854..b599def854 100755..100644
--- a/helpcontent2/source/text/swriter/01/05130002.xhp
+++ b/helpcontent2/source/text/swriter/01/05130002.xhp
diff --git a/helpcontent2/source/text/swriter/01/05130004.xhp b/helpcontent2/source/text/swriter/01/05130004.xhp
index 29d89f7bea..29d89f7bea 100755..100644
--- a/helpcontent2/source/text/swriter/01/05130004.xhp
+++ b/helpcontent2/source/text/swriter/01/05130004.xhp
diff --git a/helpcontent2/source/text/swriter/01/05140000.xhp b/helpcontent2/source/text/swriter/01/05140000.xhp
index cc9afd2d40..24f1121349 100644
--- a/helpcontent2/source/text/swriter/01/05140000.xhp
+++ b/helpcontent2/source/text/swriter/01/05140000.xhp
@@ -151,7 +151,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3150576" role="paragraph" l10n="E">
-<image id="img_id3150590" src="res/commandimagelist/sc_fillstyle.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3150590">Icon</alt>
+<image id="img_id3150590" src="cmd/sc_fillstyle.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3150590">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
@@ -166,7 +166,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3150114" role="paragraph" l10n="E">
-<image id="img_id3150122" src="res/commandimagelist/sc_stylenewbyexample.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3150122">Icon</alt>
+<image id="img_id3150122" src="cmd/sc_stylenewbyexample.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3150122">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
diff --git a/helpcontent2/source/text/swriter/01/05150000.xhp b/helpcontent2/source/text/swriter/01/05150000.xhp
index da8205e083..73f52bfccf 100755..100644
--- a/helpcontent2/source/text/swriter/01/05150000.xhp
+++ b/helpcontent2/source/text/swriter/01/05150000.xhp
@@ -10,9 +10,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/05150104.xhp b/helpcontent2/source/text/swriter/01/05150104.xhp
index 0573d28dda..0573d28dda 100755..100644
--- a/helpcontent2/source/text/swriter/01/05150104.xhp
+++ b/helpcontent2/source/text/swriter/01/05150104.xhp
diff --git a/helpcontent2/source/text/swriter/01/05150200.xhp b/helpcontent2/source/text/swriter/01/05150200.xhp
index 6892014c00..b8b1b1a531 100644
--- a/helpcontent2/source/text/swriter/01/05150200.xhp
+++ b/helpcontent2/source/text/swriter/01/05150200.xhp
@@ -10,9 +10,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/01/05180000.xhp b/helpcontent2/source/text/swriter/01/05180000.xhp
index b75f2db987..b75f2db987 100755..100644
--- a/helpcontent2/source/text/swriter/01/05180000.xhp
+++ b/helpcontent2/source/text/swriter/01/05180000.xhp
diff --git a/helpcontent2/source/text/swriter/01/05990000.xhp b/helpcontent2/source/text/swriter/01/05990000.xhp
index 81c42bca45..81c42bca45 100755..100644
--- a/helpcontent2/source/text/swriter/01/05990000.xhp
+++ b/helpcontent2/source/text/swriter/01/05990000.xhp
diff --git a/helpcontent2/source/text/swriter/01/06040000.xhp b/helpcontent2/source/text/swriter/01/06040000.xhp
index 8736c5c031..39bb873f37 100644
--- a/helpcontent2/source/text/swriter/01/06040000.xhp
+++ b/helpcontent2/source/text/swriter/01/06040000.xhp
@@ -43,7 +43,7 @@
 <bookmark xml-lang="en-US" branch="hid/.uno:WordCountDialog" id="bm_id1483504" localize="false"/>
 <section id="wordcount">
          <paragraph xml-lang="en-US" id="par_idN10542" role="heading" level="1" l10n="NEW"><link href="text/swriter/01/06040000.xhp">Word Count</link></paragraph>
-         <paragraph xml-lang="en-US" id="par_idN10552" role="paragraph" l10n="NEW"><ahelp hid="FN_WORDCOUNT_DIALOG">Counts the words and characters in the current selection and in the whole document.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_idN10552" role="paragraph" l10n="NEW"><ahelp hid="FN_WORDCOUNT_DIALOG">Counts the words and characters, with or without spaces, in the current selection and in the whole document.</ahelp></paragraph>
          <embed href="text/swriter/guide/words_count.xhp#how"/>
       </section>
       <section id="howtoget">
diff --git a/helpcontent2/source/text/swriter/01/06060100.xhp b/helpcontent2/source/text/swriter/01/06060100.xhp
index 9ed374e9d6..9ed374e9d6 100755..100644
--- a/helpcontent2/source/text/swriter/01/06060100.xhp
+++ b/helpcontent2/source/text/swriter/01/06060100.xhp
diff --git a/helpcontent2/source/text/swriter/01/06990000.xhp b/helpcontent2/source/text/swriter/01/06990000.xhp
index 97b5671707..97b5671707 100755..100644
--- a/helpcontent2/source/text/swriter/01/06990000.xhp
+++ b/helpcontent2/source/text/swriter/01/06990000.xhp
diff --git a/helpcontent2/source/text/swriter/01/format_object.xhp b/helpcontent2/source/text/swriter/01/format_object.xhp
index 810a6ffcc9..810a6ffcc9 100755..100644
--- a/helpcontent2/source/text/swriter/01/format_object.xhp
+++ b/helpcontent2/source/text/swriter/01/format_object.xhp
diff --git a/helpcontent2/source/text/swriter/01/mailmerge01.xhp b/helpcontent2/source/text/swriter/01/mailmerge01.xhp
index 782c99f6a7..782c99f6a7 100755..100644
--- a/helpcontent2/source/text/swriter/01/mailmerge01.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge01.xhp
diff --git a/helpcontent2/source/text/swriter/01/mailmerge02.xhp b/helpcontent2/source/text/swriter/01/mailmerge02.xhp
index b56cf20467..b56cf20467 100755..100644
--- a/helpcontent2/source/text/swriter/01/mailmerge02.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge02.xhp
diff --git a/helpcontent2/source/text/swriter/01/mailmerge03.xhp b/helpcontent2/source/text/swriter/01/mailmerge03.xhp
index 1fb279c293..1fb279c293 100755..100644
--- a/helpcontent2/source/text/swriter/01/mailmerge03.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge03.xhp
diff --git a/helpcontent2/source/text/swriter/01/mailmerge04.xhp b/helpcontent2/source/text/swriter/01/mailmerge04.xhp
index 55def9dbf5..55def9dbf5 100755..100644
--- a/helpcontent2/source/text/swriter/01/mailmerge04.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge04.xhp
diff --git a/helpcontent2/source/text/swriter/01/mailmerge05.xhp b/helpcontent2/source/text/swriter/01/mailmerge05.xhp
index 77df875c5d..77df875c5d 100755..100644
--- a/helpcontent2/source/text/swriter/01/mailmerge05.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge05.xhp
diff --git a/helpcontent2/source/text/swriter/01/mailmerge06.xhp b/helpcontent2/source/text/swriter/01/mailmerge06.xhp
index 898504cd81..898504cd81 100755..100644
--- a/helpcontent2/source/text/swriter/01/mailmerge06.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge06.xhp
diff --git a/helpcontent2/source/text/swriter/01/mailmerge07.xhp b/helpcontent2/source/text/swriter/01/mailmerge07.xhp
index 736d2af0af..736d2af0af 100755..100644
--- a/helpcontent2/source/text/swriter/01/mailmerge07.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge07.xhp
diff --git a/helpcontent2/source/text/swriter/01/mailmerge08.xhp b/helpcontent2/source/text/swriter/01/mailmerge08.xhp
index f714f59b9b..f714f59b9b 100755..100644
--- a/helpcontent2/source/text/swriter/01/mailmerge08.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge08.xhp
diff --git a/helpcontent2/source/text/swriter/01/mm_copyto.xhp b/helpcontent2/source/text/swriter/01/mm_copyto.xhp
index 0b915fe3a5..0b915fe3a5 100755..100644
--- a/helpcontent2/source/text/swriter/01/mm_copyto.xhp
+++ b/helpcontent2/source/text/swriter/01/mm_copyto.xhp
diff --git a/helpcontent2/source/text/swriter/01/mm_cusaddfie.xhp b/helpcontent2/source/text/swriter/01/mm_cusaddfie.xhp
index 0635b91f96..0635b91f96 100755..100644
--- a/helpcontent2/source/text/swriter/01/mm_cusaddfie.xhp
+++ b/helpcontent2/source/text/swriter/01/mm_cusaddfie.xhp
diff --git a/helpcontent2/source/text/swriter/01/mm_cusaddlis.xhp b/helpcontent2/source/text/swriter/01/mm_cusaddlis.xhp
index 04669e5430..04669e5430 100755..100644
--- a/helpcontent2/source/text/swriter/01/mm_cusaddlis.xhp
+++ b/helpcontent2/source/text/swriter/01/mm_cusaddlis.xhp
diff --git a/helpcontent2/source/text/swriter/01/mm_emabod.xhp b/helpcontent2/source/text/swriter/01/mm_emabod.xhp
index 33244a9a16..33244a9a16 100755..100644
--- a/helpcontent2/source/text/swriter/01/mm_emabod.xhp
+++ b/helpcontent2/source/text/swriter/01/mm_emabod.xhp
diff --git a/helpcontent2/source/text/swriter/01/mm_finent.xhp b/helpcontent2/source/text/swriter/01/mm_finent.xhp
index d9ae39e6f5..d9ae39e6f5 100755..100644
--- a/helpcontent2/source/text/swriter/01/mm_finent.xhp
+++ b/helpcontent2/source/text/swriter/01/mm_finent.xhp
diff --git a/helpcontent2/source/text/swriter/01/mm_matfie.xhp b/helpcontent2/source/text/swriter/01/mm_matfie.xhp
index 14eb72c10c..14eb72c10c 100755..100644
--- a/helpcontent2/source/text/swriter/01/mm_matfie.xhp
+++ b/helpcontent2/source/text/swriter/01/mm_matfie.xhp
diff --git a/helpcontent2/source/text/swriter/01/mm_newaddblo.xhp b/helpcontent2/source/text/swriter/01/mm_newaddblo.xhp
index f9f7b96856..f9f7b96856 100755..100644
--- a/helpcontent2/source/text/swriter/01/mm_newaddblo.xhp
+++ b/helpcontent2/source/text/swriter/01/mm_newaddblo.xhp
diff --git a/helpcontent2/source/text/swriter/01/mm_newaddlis.xhp b/helpcontent2/source/text/swriter/01/mm_newaddlis.xhp
index 9ea2097d6d..9ea2097d6d 100755..100644
--- a/helpcontent2/source/text/swriter/01/mm_newaddlis.xhp
+++ b/helpcontent2/source/text/swriter/01/mm_newaddlis.xhp
diff --git a/helpcontent2/source/text/swriter/01/mm_seladdblo.xhp b/helpcontent2/source/text/swriter/01/mm_seladdblo.xhp
index 78cdc0c158..78cdc0c158 100755..100644
--- a/helpcontent2/source/text/swriter/01/mm_seladdblo.xhp
+++ b/helpcontent2/source/text/swriter/01/mm_seladdblo.xhp
diff --git a/helpcontent2/source/text/swriter/02/02110000.xhp b/helpcontent2/source/text/swriter/02/02110000.xhp
index 3916339c9e..fe5cebb271 100644
--- a/helpcontent2/source/text/swriter/02/02110000.xhp
+++ b/helpcontent2/source/text/swriter/02/02110000.xhp
@@ -54,7 +54,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150502" xml-lang="en-US" l10n="E">
-<image id="img_id3150508" src="res/commandimagelist/sc_defaultnumbering.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150508" xml-lang="en-US">Icon</alt>
+<image id="img_id3150508" src="cmd/sc_defaultnumbering.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150508" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/swriter/02/03210000.xhp b/helpcontent2/source/text/swriter/02/03210000.xhp
index 58853a5aef..bc72b270c3 100644
--- a/helpcontent2/source/text/swriter/02/03210000.xhp
+++ b/helpcontent2/source/text/swriter/02/03210000.xhp
@@ -52,7 +52,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3145244" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_chainframes.png" id="img_id3148771"><alt xml-lang="en-US" id="alt_id3148771">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3145244" xml-lang="en-US" oldref=""><image src="cmd/sc_chainframes.png" id="img_id3148771"><alt xml-lang="en-US" id="alt_id3148771">Icon</alt></image></paragraph>
 
      </tablecell>
      <tablecell>
diff --git a/helpcontent2/source/text/swriter/02/03220000.xhp b/helpcontent2/source/text/swriter/02/03220000.xhp
index 2e8549163d..9b5f82fde7 100644
--- a/helpcontent2/source/text/swriter/02/03220000.xhp
+++ b/helpcontent2/source/text/swriter/02/03220000.xhp
@@ -56,7 +56,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155903" xml-lang="en-US" l10n="E">
-<image id="img_id3149687" src="res/commandimagelist/sc_unhainframes.png" width="5.64mm" height="5.64mm"><alt id="alt_id3149687" xml-lang="en-US">Icon</alt>
+<image id="img_id3149687" src="cmd/sc_unhainframes.png" width="5.64mm" height="5.64mm"><alt id="alt_id3149687" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/swriter/02/04090000.xhp b/helpcontent2/source/text/swriter/02/04090000.xhp
index 1ad22fcecf..1d11e88035 100644
--- a/helpcontent2/source/text/swriter/02/04090000.xhp
+++ b/helpcontent2/source/text/swriter/02/04090000.xhp
@@ -56,7 +56,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3151180" xml-lang="en-US" l10n="E">
-<image id="img_id3151189" src="res/commandimagelist/sc_insertrows.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151189" xml-lang="en-US">Icon</alt>
+<image id="img_id3151189" src="cmd/sc_insertrows.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151189" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/swriter/02/04100000.xhp b/helpcontent2/source/text/swriter/02/04100000.xhp
index a37a6730a5..7a6a141b90 100644
--- a/helpcontent2/source/text/swriter/02/04100000.xhp
+++ b/helpcontent2/source/text/swriter/02/04100000.xhp
@@ -56,7 +56,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3149691" xml-lang="en-US" l10n="E">
-<image id="img_id3155174" src="res/commandimagelist/sc_insertcolumns.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155174" xml-lang="en-US">Icon</alt>
+<image id="img_id3155174" src="cmd/sc_insertcolumns.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155174" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/swriter/02/04220000.xhp b/helpcontent2/source/text/swriter/02/04220000.xhp
index 9a81727e5c..91b58ef077 100644
--- a/helpcontent2/source/text/swriter/02/04220000.xhp
+++ b/helpcontent2/source/text/swriter/02/04220000.xhp
@@ -52,7 +52,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3155896" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_tablemodefix.png" id="img_id3155903"><alt xml-lang="en-US" id="alt_id3155903">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3155896" xml-lang="en-US" oldref=""><image src="cmd/sc_tablemodefix.png" id="img_id3155903"><alt xml-lang="en-US" id="alt_id3155903">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3155066" l10n="U" xml-lang="en-US" oldref="2">Table: Fixed</paragraph>
diff --git a/helpcontent2/source/text/swriter/02/04230000.xhp b/helpcontent2/source/text/swriter/02/04230000.xhp
index 33cd9852d8..0ea62d718f 100644
--- a/helpcontent2/source/text/swriter/02/04230000.xhp
+++ b/helpcontent2/source/text/swriter/02/04230000.xhp
@@ -52,7 +52,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3145087" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_tablemodefixprop.png" id="img_id3156378"><alt xml-lang="en-US" id="alt_id3156378">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3145087" xml-lang="en-US" oldref=""><image src="cmd/sc_tablemodefixprop.png" id="img_id3156378"><alt xml-lang="en-US" id="alt_id3156378">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3149497" l10n="U" xml-lang="en-US" oldref="2">Table: Fixed, Proportional</paragraph>
diff --git a/helpcontent2/source/text/swriter/02/04240000.xhp b/helpcontent2/source/text/swriter/02/04240000.xhp
index 9478b5d273..857d9b25dc 100644
--- a/helpcontent2/source/text/swriter/02/04240000.xhp
+++ b/helpcontent2/source/text/swriter/02/04240000.xhp
@@ -52,7 +52,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3145415" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_tablemodevariable.png" id="img_id3156375"><alt xml-lang="en-US" id="alt_id3156375">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3145415" xml-lang="en-US" oldref=""><image src="cmd/sc_tablemodevariable.png" id="img_id3156375"><alt xml-lang="en-US" id="alt_id3156375">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3156410" l10n="U" xml-lang="en-US" oldref="2">Table: Variable</paragraph>
diff --git a/helpcontent2/source/text/swriter/02/04250000.xhp b/helpcontent2/source/text/swriter/02/04250000.xhp
index afb5c7139c..b9b13581a2 100644
--- a/helpcontent2/source/text/swriter/02/04250000.xhp
+++ b/helpcontent2/source/text/swriter/02/04250000.xhp
@@ -56,7 +56,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145418" xml-lang="en-US" l10n="E">
-<image id="img_id3147512" src="res/commandimagelist/sc_autosum.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147512" xml-lang="en-US">Icon</alt>
+<image id="img_id3147512" src="cmd/sc_autosum.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147512" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/swriter/02/06040000.xhp b/helpcontent2/source/text/swriter/02/06040000.xhp
index 709ab6fc75..8532a99b9e 100644
--- a/helpcontent2/source/text/swriter/02/06040000.xhp
+++ b/helpcontent2/source/text/swriter/02/06040000.xhp
@@ -52,7 +52,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3151177" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_removebullets.png" id="img_id3145083"><alt xml-lang="en-US" id="alt_id3145083">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3151177" xml-lang="en-US" oldref=""><image src="cmd/sc_removebullets.png" id="img_id3145083"><alt xml-lang="en-US" id="alt_id3145083">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3150749" l10n="U" xml-lang="en-US" oldref="3">Numbering Off</paragraph>
diff --git a/helpcontent2/source/text/swriter/02/06070000.xhp b/helpcontent2/source/text/swriter/02/06070000.xhp
index 5bcf144092..d56436122d 100644
--- a/helpcontent2/source/text/swriter/02/06070000.xhp
+++ b/helpcontent2/source/text/swriter/02/06070000.xhp
@@ -53,7 +53,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145084" xml-lang="en-US" l10n="E">
-<image id="img_id3156376" src="res/commandimagelist/sc_decrementsublevels.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156376" xml-lang="en-US">Icon</alt>
+<image id="img_id3156376" src="cmd/sc_decrementsublevels.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156376" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/swriter/02/06080000.xhp b/helpcontent2/source/text/swriter/02/06080000.xhp
index ff271e502e..63f238d2fa 100644
--- a/helpcontent2/source/text/swriter/02/06080000.xhp
+++ b/helpcontent2/source/text/swriter/02/06080000.xhp
@@ -53,7 +53,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3145410" xml-lang="en-US" l10n="E">
-<image id="img_id3145421" src="res/commandimagelist/sc_incrementsublevels.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145421" xml-lang="en-US">Icon</alt>
+<image id="img_id3145421" src="cmd/sc_incrementsublevels.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145421" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/swriter/02/06090000.xhp b/helpcontent2/source/text/swriter/02/06090000.xhp
index 4039171c39..ce4779ff32 100644
--- a/helpcontent2/source/text/swriter/02/06090000.xhp
+++ b/helpcontent2/source/text/swriter/02/06090000.xhp
@@ -53,7 +53,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3156377" xml-lang="en-US" l10n="E">
-<image id="img_id3156384" src="res/commandimagelist/sc_insertneutralparagraph.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156384" xml-lang="en-US">Icon</alt>
+<image id="img_id3156384" src="cmd/sc_insertneutralparagraph.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156384" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/swriter/02/06120000.xhp b/helpcontent2/source/text/swriter/02/06120000.xhp
index e46cfb1177..d3efc49093 100644
--- a/helpcontent2/source/text/swriter/02/06120000.xhp
+++ b/helpcontent2/source/text/swriter/02/06120000.xhp
@@ -52,7 +52,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3145083" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_moveupsubitems.png" id="img_id3156375"><alt xml-lang="en-US" id="alt_id3156375">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3145083" xml-lang="en-US" oldref=""><image src="cmd/sc_moveupsubitems.png" id="img_id3156375"><alt xml-lang="en-US" id="alt_id3156375">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3156410" l10n="U" xml-lang="en-US" oldref="3">Move Up with Subpoints</paragraph>
diff --git a/helpcontent2/source/text/swriter/02/06130000.xhp b/helpcontent2/source/text/swriter/02/06130000.xhp
index 0d189ce28e..6b3dc02cfa 100644
--- a/helpcontent2/source/text/swriter/02/06130000.xhp
+++ b/helpcontent2/source/text/swriter/02/06130000.xhp
@@ -52,7 +52,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3145086" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_movedownsubitems.png" id="img_id3156377"><alt xml-lang="en-US" id="alt_id3156377">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3145086" xml-lang="en-US" oldref=""><image src="cmd/sc_movedownsubitems.png" id="img_id3156377"><alt xml-lang="en-US" id="alt_id3156377">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3150749" l10n="U" xml-lang="en-US" oldref="3">Move Down with Subpoints</paragraph>
diff --git a/helpcontent2/source/text/swriter/02/06140000.xhp b/helpcontent2/source/text/swriter/02/06140000.xhp
index a92331e425..a594ef8bf5 100644
--- a/helpcontent2/source/text/swriter/02/06140000.xhp
+++ b/helpcontent2/source/text/swriter/02/06140000.xhp
@@ -52,7 +52,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3145082" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_numberingstart.png" id="img_id3145089"><alt xml-lang="en-US" id="alt_id3145089">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3145082" xml-lang="en-US" oldref=""><image src="cmd/sc_numberingstart.png" id="img_id3145089"><alt xml-lang="en-US" id="alt_id3145089">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3145086" l10n="U" xml-lang="en-US" oldref="3">Restart Numbering</paragraph>
diff --git a/helpcontent2/source/text/swriter/02/10010000.xhp b/helpcontent2/source/text/swriter/02/10010000.xhp
index 556a7dc05e..5f2d882ccf 100644
--- a/helpcontent2/source/text/swriter/02/10010000.xhp
+++ b/helpcontent2/source/text/swriter/02/10010000.xhp
@@ -52,7 +52,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3154572" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_helpzoomin.png" id="img_id3155895"><alt xml-lang="en-US" id="alt_id3155895">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3154572" xml-lang="en-US" oldref=""><image src="cmd/sc_helpzoomin.png" id="img_id3155895"><alt xml-lang="en-US" id="alt_id3155895">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3155892" l10n="U" xml-lang="en-US" oldref="3">Zoom In</paragraph>
diff --git a/helpcontent2/source/text/swriter/02/10020000.xhp b/helpcontent2/source/text/swriter/02/10020000.xhp
index aa8dfa3b10..93579a93fa 100644
--- a/helpcontent2/source/text/swriter/02/10020000.xhp
+++ b/helpcontent2/source/text/swriter/02/10020000.xhp
@@ -51,7 +51,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3148775" xml-lang="en-US" l10n="E">
-<image id="img_id3150764" src="res/commandimagelist/sc_zoomout.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3150764" xml-lang="en-US">Icon</alt>
+<image id="img_id3150764" src="cmd/sc_zoomout.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3150764" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/swriter/02/10050000.xhp b/helpcontent2/source/text/swriter/02/10050000.xhp
index f1d1c12940..8307819bb9 100644
--- a/helpcontent2/source/text/swriter/02/10050000.xhp
+++ b/helpcontent2/source/text/swriter/02/10050000.xhp
@@ -52,7 +52,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3149292" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_showtwopages.png" id="img_id3151170"><alt xml-lang="en-US" id="alt_id3151170">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3149292" xml-lang="en-US" oldref=""><image src="cmd/sc_showtwopages.png" id="img_id3151170"><alt xml-lang="en-US" id="alt_id3151170">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3151168" l10n="U" xml-lang="en-US" oldref="3">Page Preview: Two Pages</paragraph>
diff --git a/helpcontent2/source/text/swriter/02/10070000.xhp b/helpcontent2/source/text/swriter/02/10070000.xhp
index 3bcfb91e23..f1538ac326 100644
--- a/helpcontent2/source/text/swriter/02/10070000.xhp
+++ b/helpcontent2/source/text/swriter/02/10070000.xhp
@@ -53,7 +53,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3152738" xml-lang="en-US" l10n="E">
-<image id="img_id3152744" src="res/commandimagelist/sc_showmultiplepages.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152744" xml-lang="en-US">Icon</alt>
+<image id="img_id3152744" src="cmd/sc_showmultiplepages.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152744" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/swriter/02/10080000.xhp b/helpcontent2/source/text/swriter/02/10080000.xhp
index cc412fc6cb..fe3c71804e 100644
--- a/helpcontent2/source/text/swriter/02/10080000.xhp
+++ b/helpcontent2/source/text/swriter/02/10080000.xhp
@@ -56,7 +56,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_idN10635" xml-lang="en-US" l10n="NEW">
-<image id="img_id8750572" src="res/commandimagelist/sc_showbookview.png" width="0.222inch" height="0.222inch"><alt id="alt_id8750572" xml-lang="en-US">book preview icon</alt>
+<image id="img_id8750572" src="cmd/sc_showbookview.png" width="0.222inch" height="0.222inch"><alt id="alt_id8750572" xml-lang="en-US">book preview icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/swriter/02/10090000.xhp b/helpcontent2/source/text/swriter/02/10090000.xhp
index ab0b7abdee..4174312f3d 100644
--- a/helpcontent2/source/text/swriter/02/10090000.xhp
+++ b/helpcontent2/source/text/swriter/02/10090000.xhp
@@ -48,7 +48,7 @@
             <tablerow>
                <tablecell>
                   <paragraph xml-lang="en-US" id="par_id3149811" role="paragraph" l10n="E">
-<image id="img_id3154575" src="res/commandimagelist/sc_printpagepreview.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3154575">Icon</alt>
+<image id="img_id3154575" src="cmd/sc_printpagepreview.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3154575">Icon</alt>
 	</image></paragraph>
                </tablecell>
                <tablecell>
diff --git a/helpcontent2/source/text/swriter/02/10110000.xhp b/helpcontent2/source/text/swriter/02/10110000.xhp
index e73891532d..9faa01f802 100644
--- a/helpcontent2/source/text/swriter/02/10110000.xhp
+++ b/helpcontent2/source/text/swriter/02/10110000.xhp
@@ -54,7 +54,7 @@
 
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3143270" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_printersetup.png" id="img_id3143277"><alt xml-lang="en-US" id="alt_id3143277">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3143270" xml-lang="en-US" oldref=""><image src="cmd/sc_printersetup.png" id="img_id3143277"><alt xml-lang="en-US" id="alt_id3143277">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3149099" l10n="U" xml-lang="en-US" oldref="3">Print options page view</paragraph>
diff --git a/helpcontent2/source/text/swriter/02/14010000.xhp b/helpcontent2/source/text/swriter/02/14010000.xhp
index c7b90cb0fa..c7b90cb0fa 100755..100644
--- a/helpcontent2/source/text/swriter/02/14010000.xhp
+++ b/helpcontent2/source/text/swriter/02/14010000.xhp
diff --git a/helpcontent2/source/text/swriter/02/18120000.xhp b/helpcontent2/source/text/swriter/02/18120000.xhp
index 46893ed7c4..03e822166e 100644
--- a/helpcontent2/source/text/swriter/02/18120000.xhp
+++ b/helpcontent2/source/text/swriter/02/18120000.xhp
@@ -57,7 +57,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3151177" xml-lang="en-US" l10n="E">
-<image id="img_id3156379" src="res/commandimagelist/sc_graphic.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156379" xml-lang="en-US">Icon</alt>
+<image id="img_id3156379" src="cmd/sc_graphic.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156379" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/swriter/02/18130000.xhp b/helpcontent2/source/text/swriter/02/18130000.xhp
index 189149e8ad..91affab53d 100644
--- a/helpcontent2/source/text/swriter/02/18130000.xhp
+++ b/helpcontent2/source/text/swriter/02/18130000.xhp
@@ -48,7 +48,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3147508" xml-lang="en-US" l10n="E">
-<image id="img_id3154840" src="res/commandimagelist/sc_shadowcursor.png"  ><alt id="alt_id3154840" xml-lang="en-US">Icon</alt>
+<image id="img_id3154840" src="cmd/sc_shadowcursor.png"  ><alt id="alt_id3154840" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/swriter/02/19030000.xhp b/helpcontent2/source/text/swriter/02/19030000.xhp
index 30fb2fa6ab..11bcb871f1 100644
--- a/helpcontent2/source/text/swriter/02/19030000.xhp
+++ b/helpcontent2/source/text/swriter/02/19030000.xhp
@@ -48,7 +48,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3151171" xml-lang="en-US" l10n="E">
-<image id="img_id3151178" src="res/commandimagelist/sc_grid.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151178" xml-lang="en-US">Icon</alt>
+<image id="img_id3151178" src="cmd/sc_grid.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151178" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/swriter/02/19040000.xhp b/helpcontent2/source/text/swriter/02/19040000.xhp
index 440f56909a..440f56909a 100755..100644
--- a/helpcontent2/source/text/swriter/02/19040000.xhp
+++ b/helpcontent2/source/text/swriter/02/19040000.xhp
diff --git a/helpcontent2/source/text/swriter/02/19050000.xhp b/helpcontent2/source/text/swriter/02/19050000.xhp
index 6d0dc9ed28..4bfc452594 100644
--- a/helpcontent2/source/text/swriter/02/19050000.xhp
+++ b/helpcontent2/source/text/swriter/02/19050000.xhp
@@ -51,7 +51,7 @@
    
     <tablerow>
      <tablecell>
-      <paragraph l10n="E" role="paragraph" id="par_id3149286" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_text_marquee.png" id="img_id3149292"><alt xml-lang="en-US" id="alt_id3149292">Icon</alt></image></paragraph>
+      <paragraph l10n="E" role="paragraph" id="par_id3149286" xml-lang="en-US" oldref=""><image src="cmd/sc_text_marquee.png" id="img_id3149292"><alt xml-lang="en-US" id="alt_id3149292">Icon</alt></image></paragraph>
      </tablecell>
      <tablecell>
       <paragraph role="paragraph" id="par_id3149290" l10n="U" xml-lang="en-US" oldref="2">Text Animation</paragraph>
diff --git a/helpcontent2/source/text/swriter/04/01020000.xhp b/helpcontent2/source/text/swriter/04/01020000.xhp
index 2f84a72b9b..2f84a72b9b 100755..100644
--- a/helpcontent2/source/text/swriter/04/01020000.xhp
+++ b/helpcontent2/source/text/swriter/04/01020000.xhp
diff --git a/helpcontent2/source/text/swriter/guide/anchor_object.xhp b/helpcontent2/source/text/swriter/guide/anchor_object.xhp
index 3221948703..3221948703 100755..100644
--- a/helpcontent2/source/text/swriter/guide/anchor_object.xhp
+++ b/helpcontent2/source/text/swriter/guide/anchor_object.xhp
diff --git a/helpcontent2/source/text/swriter/guide/arrange_chapters.xhp b/helpcontent2/source/text/swriter/guide/arrange_chapters.xhp
index 2406025aeb..ea54187142 100644
--- a/helpcontent2/source/text/swriter/guide/arrange_chapters.xhp
+++ b/helpcontent2/source/text/swriter/guide/arrange_chapters.xhp
@@ -58,7 +58,7 @@
 <list type="ordered">
 <listitem>
 <paragraph role="listitem" id="par_id3151206" xml-lang="en-US" l10n="U" oldref="71">On the <emph>Standard Bar</emph>, click the<emph> Navigator</emph> icon 
-<image id="img_id5211883" src="res/commandimagelist/sc_navigator.png" width="0.564cm" height="0.564cm"><alt id="alt_id5211883" xml-lang="en-US">Icon</alt>
+<image id="img_id5211883" src="cmd/sc_navigator.png" width="0.564cm" height="0.564cm"><alt id="alt_id5211883" xml-lang="en-US">Icon</alt>
 	</image> to open the <emph>Navigator</emph>.</paragraph>
 </listitem>
 <listitem>
diff --git a/helpcontent2/source/text/swriter/guide/auto_off.xhp b/helpcontent2/source/text/swriter/guide/auto_off.xhp
index 3743c41fa2..3743c41fa2 100755..100644
--- a/helpcontent2/source/text/swriter/guide/auto_off.xhp
+++ b/helpcontent2/source/text/swriter/guide/auto_off.xhp
diff --git a/helpcontent2/source/text/swriter/guide/auto_spellcheck.xhp b/helpcontent2/source/text/swriter/guide/auto_spellcheck.xhp
index d342b5c99a..d342b5c99a 100755..100644
--- a/helpcontent2/source/text/swriter/guide/auto_spellcheck.xhp
+++ b/helpcontent2/source/text/swriter/guide/auto_spellcheck.xhp
diff --git a/helpcontent2/source/text/swriter/guide/autotext.xhp b/helpcontent2/source/text/swriter/guide/autotext.xhp
index b0193e62d0..b0193e62d0 100755..100644
--- a/helpcontent2/source/text/swriter/guide/autotext.xhp
+++ b/helpcontent2/source/text/swriter/guide/autotext.xhp
diff --git a/helpcontent2/source/text/swriter/guide/borders.xhp b/helpcontent2/source/text/swriter/guide/borders.xhp
index 10d35ebdda..10d35ebdda 100755..100644
--- a/helpcontent2/source/text/swriter/guide/borders.xhp
+++ b/helpcontent2/source/text/swriter/guide/borders.xhp
diff --git a/helpcontent2/source/text/swriter/guide/calculate.xhp b/helpcontent2/source/text/swriter/guide/calculate.xhp
index fc32c8b81c..fc32c8b81c 100755..100644
--- a/helpcontent2/source/text/swriter/guide/calculate.xhp
+++ b/helpcontent2/source/text/swriter/guide/calculate.xhp
diff --git a/helpcontent2/source/text/swriter/guide/calculate_clipboard.xhp b/helpcontent2/source/text/swriter/guide/calculate_clipboard.xhp
index 56c82f2a2f..56c82f2a2f 100755..100644
--- a/helpcontent2/source/text/swriter/guide/calculate_clipboard.xhp
+++ b/helpcontent2/source/text/swriter/guide/calculate_clipboard.xhp
diff --git a/helpcontent2/source/text/swriter/guide/calculate_intable.xhp b/helpcontent2/source/text/swriter/guide/calculate_intable.xhp
index 1460acf140..1460acf140 100755..100644
--- a/helpcontent2/source/text/swriter/guide/calculate_intable.xhp
+++ b/helpcontent2/source/text/swriter/guide/calculate_intable.xhp
diff --git a/helpcontent2/source/text/swriter/guide/calculate_intext.xhp b/helpcontent2/source/text/swriter/guide/calculate_intext.xhp
index 8dee9d598c..8dee9d598c 100755..100644
--- a/helpcontent2/source/text/swriter/guide/calculate_intext.xhp
+++ b/helpcontent2/source/text/swriter/guide/calculate_intext.xhp
diff --git a/helpcontent2/source/text/swriter/guide/calculate_intext2.xhp b/helpcontent2/source/text/swriter/guide/calculate_intext2.xhp
index 0f03ffaa39..0f03ffaa39 100755..100644
--- a/helpcontent2/source/text/swriter/guide/calculate_intext2.xhp
+++ b/helpcontent2/source/text/swriter/guide/calculate_intext2.xhp
diff --git a/helpcontent2/source/text/swriter/guide/calculate_multitable.xhp b/helpcontent2/source/text/swriter/guide/calculate_multitable.xhp
index fb7557d82d..fb7557d82d 100755..100644
--- a/helpcontent2/source/text/swriter/guide/calculate_multitable.xhp
+++ b/helpcontent2/source/text/swriter/guide/calculate_multitable.xhp
diff --git a/helpcontent2/source/text/swriter/guide/change_header.xhp b/helpcontent2/source/text/swriter/guide/change_header.xhp
index 9a3b24af7e..9a3b24af7e 100755..100644
--- a/helpcontent2/source/text/swriter/guide/change_header.xhp
+++ b/helpcontent2/source/text/swriter/guide/change_header.xhp
diff --git a/helpcontent2/source/text/swriter/guide/conditional_text2.xhp b/helpcontent2/source/text/swriter/guide/conditional_text2.xhp
index cc544171f5..cc544171f5 100755..100644
--- a/helpcontent2/source/text/swriter/guide/conditional_text2.xhp
+++ b/helpcontent2/source/text/swriter/guide/conditional_text2.xhp
diff --git a/helpcontent2/source/text/swriter/guide/delete_from_dict.xhp b/helpcontent2/source/text/swriter/guide/delete_from_dict.xhp
index 4e66700b57..4e66700b57 100755..100644
--- a/helpcontent2/source/text/swriter/guide/delete_from_dict.xhp
+++ b/helpcontent2/source/text/swriter/guide/delete_from_dict.xhp
diff --git a/helpcontent2/source/text/swriter/guide/even_odd_sdw.xhp b/helpcontent2/source/text/swriter/guide/even_odd_sdw.xhp
index eb4ef58852..c63fd6db12 100644
--- a/helpcontent2/source/text/swriter/guide/even_odd_sdw.xhp
+++ b/helpcontent2/source/text/swriter/guide/even_odd_sdw.xhp
@@ -55,7 +55,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3154265" role="paragraph" l10n="E">
-<image id="img_id3155876" src="res/commandimagelist/sc_designerdialog.png" width="0.1862in" height="0.1862in"><alt xml-lang="en-US" id="alt_id3155876">Icon</alt>
+<image id="img_id3155876" src="cmd/sc_designerdialog.png" width="0.1862in" height="0.1862in"><alt xml-lang="en-US" id="alt_id3155876">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
diff --git a/helpcontent2/source/text/swriter/guide/field_convert.xhp b/helpcontent2/source/text/swriter/guide/field_convert.xhp
index e8fd92a383..e8fd92a383 100755..100644
--- a/helpcontent2/source/text/swriter/guide/field_convert.xhp
+++ b/helpcontent2/source/text/swriter/guide/field_convert.xhp
diff --git a/helpcontent2/source/text/swriter/guide/fields_date.xhp b/helpcontent2/source/text/swriter/guide/fields_date.xhp
index f26b0c567f..f26b0c567f 100755..100644
--- a/helpcontent2/source/text/swriter/guide/fields_date.xhp
+++ b/helpcontent2/source/text/swriter/guide/fields_date.xhp
diff --git a/helpcontent2/source/text/swriter/guide/footer_nextpage.xhp b/helpcontent2/source/text/swriter/guide/footer_nextpage.xhp
index f47a3048c7..f47a3048c7 100755..100644
--- a/helpcontent2/source/text/swriter/guide/footer_nextpage.xhp
+++ b/helpcontent2/source/text/swriter/guide/footer_nextpage.xhp
diff --git a/helpcontent2/source/text/swriter/guide/footer_pagenumber.xhp b/helpcontent2/source/text/swriter/guide/footer_pagenumber.xhp
index 1ade596d99..1ade596d99 100755..100644
--- a/helpcontent2/source/text/swriter/guide/footer_pagenumber.xhp
+++ b/helpcontent2/source/text/swriter/guide/footer_pagenumber.xhp
diff --git a/helpcontent2/source/text/swriter/guide/footnote_usage.xhp b/helpcontent2/source/text/swriter/guide/footnote_usage.xhp
index c27dac09d1..97870ebd67 100644
--- a/helpcontent2/source/text/swriter/guide/footnote_usage.xhp
+++ b/helpcontent2/source/text/swriter/guide/footnote_usage.xhp
@@ -78,7 +78,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3148843" role="paragraph" l10n="E">
-<image id="img_id3148857" src="res/commandimagelist/sc_insertfootnote.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3148857">Icon</alt>
+<image id="img_id3148857" src="cmd/sc_insertfootnote.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3148857">Icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
diff --git a/helpcontent2/source/text/swriter/guide/footnote_with_line.xhp b/helpcontent2/source/text/swriter/guide/footnote_with_line.xhp
index 52e105c355..52e105c355 100755..100644
--- a/helpcontent2/source/text/swriter/guide/footnote_with_line.xhp
+++ b/helpcontent2/source/text/swriter/guide/footnote_with_line.xhp
diff --git a/helpcontent2/source/text/swriter/guide/form_letters_main.xhp b/helpcontent2/source/text/swriter/guide/form_letters_main.xhp
index b3a90819ed..b3a90819ed 100755..100644
--- a/helpcontent2/source/text/swriter/guide/form_letters_main.xhp
+++ b/helpcontent2/source/text/swriter/guide/form_letters_main.xhp
diff --git a/helpcontent2/source/text/swriter/guide/header_pagestyles.xhp b/helpcontent2/source/text/swriter/guide/header_pagestyles.xhp
index 2d5b51411b..2d5b51411b 100755..100644
--- a/helpcontent2/source/text/swriter/guide/header_pagestyles.xhp
+++ b/helpcontent2/source/text/swriter/guide/header_pagestyles.xhp
diff --git a/helpcontent2/source/text/swriter/guide/hidden_text.xhp b/helpcontent2/source/text/swriter/guide/hidden_text.xhp
index b2741900b1..b2741900b1 100755..100644
--- a/helpcontent2/source/text/swriter/guide/hidden_text.xhp
+++ b/helpcontent2/source/text/swriter/guide/hidden_text.xhp
diff --git a/helpcontent2/source/text/swriter/guide/hyperlinks.xhp b/helpcontent2/source/text/swriter/guide/hyperlinks.xhp
index 729c4fb9ae..729c4fb9ae 100755..100644
--- a/helpcontent2/source/text/swriter/guide/hyperlinks.xhp
+++ b/helpcontent2/source/text/swriter/guide/hyperlinks.xhp
diff --git a/helpcontent2/source/text/swriter/guide/indices_delete.xhp b/helpcontent2/source/text/swriter/guide/indices_delete.xhp
index 8eee7d6bb6..8eee7d6bb6 100755..100644
--- a/helpcontent2/source/text/swriter/guide/indices_delete.xhp
+++ b/helpcontent2/source/text/swriter/guide/indices_delete.xhp
diff --git a/helpcontent2/source/text/swriter/guide/indices_edit.xhp b/helpcontent2/source/text/swriter/guide/indices_edit.xhp
index e3c0851cc8..e3c0851cc8 100755..100644
--- a/helpcontent2/source/text/swriter/guide/indices_edit.xhp
+++ b/helpcontent2/source/text/swriter/guide/indices_edit.xhp
diff --git a/helpcontent2/source/text/swriter/guide/indices_enter.xhp b/helpcontent2/source/text/swriter/guide/indices_enter.xhp
index cba62f51b9..cba62f51b9 100755..100644
--- a/helpcontent2/source/text/swriter/guide/indices_enter.xhp
+++ b/helpcontent2/source/text/swriter/guide/indices_enter.xhp
diff --git a/helpcontent2/source/text/swriter/guide/indices_index.xhp b/helpcontent2/source/text/swriter/guide/indices_index.xhp
index 755b4d6e09..755b4d6e09 100755..100644
--- a/helpcontent2/source/text/swriter/guide/indices_index.xhp
+++ b/helpcontent2/source/text/swriter/guide/indices_index.xhp
diff --git a/helpcontent2/source/text/swriter/guide/indices_multidoc.xhp b/helpcontent2/source/text/swriter/guide/indices_multidoc.xhp
index dfb2f76e29..dfb2f76e29 100755..100644
--- a/helpcontent2/source/text/swriter/guide/indices_multidoc.xhp
+++ b/helpcontent2/source/text/swriter/guide/indices_multidoc.xhp
diff --git a/helpcontent2/source/text/swriter/guide/indices_toc.xhp b/helpcontent2/source/text/swriter/guide/indices_toc.xhp
index e85642c04e..e85642c04e 100755..100644
--- a/helpcontent2/source/text/swriter/guide/indices_toc.xhp
+++ b/helpcontent2/source/text/swriter/guide/indices_toc.xhp
diff --git a/helpcontent2/source/text/swriter/guide/insert_beforetable.xhp b/helpcontent2/source/text/swriter/guide/insert_beforetable.xhp
index 027ed5b36b..027ed5b36b 100755..100644
--- a/helpcontent2/source/text/swriter/guide/insert_beforetable.xhp
+++ b/helpcontent2/source/text/swriter/guide/insert_beforetable.xhp
diff --git a/helpcontent2/source/text/swriter/guide/insert_graphic.xhp b/helpcontent2/source/text/swriter/guide/insert_graphic.xhp
index c9f9d3fd71..c9f9d3fd71 100755..100644
--- a/helpcontent2/source/text/swriter/guide/insert_graphic.xhp
+++ b/helpcontent2/source/text/swriter/guide/insert_graphic.xhp
diff --git a/helpcontent2/source/text/swriter/guide/insert_graphic_dialog.xhp b/helpcontent2/source/text/swriter/guide/insert_graphic_dialog.xhp
index d2a6d8a453..d2a6d8a453 100755..100644
--- a/helpcontent2/source/text/swriter/guide/insert_graphic_dialog.xhp
+++ b/helpcontent2/source/text/swriter/guide/insert_graphic_dialog.xhp
diff --git a/helpcontent2/source/text/swriter/guide/insert_graphic_fromdraw.xhp b/helpcontent2/source/text/swriter/guide/insert_graphic_fromdraw.xhp
index 6dabe2564a..6dabe2564a 100755..100644
--- a/helpcontent2/source/text/swriter/guide/insert_graphic_fromdraw.xhp
+++ b/helpcontent2/source/text/swriter/guide/insert_graphic_fromdraw.xhp
diff --git a/helpcontent2/source/text/swriter/guide/insert_graphic_gallery.xhp b/helpcontent2/source/text/swriter/guide/insert_graphic_gallery.xhp
index f0e6a1a10e..f0e6a1a10e 100755..100644
--- a/helpcontent2/source/text/swriter/guide/insert_graphic_gallery.xhp
+++ b/helpcontent2/source/text/swriter/guide/insert_graphic_gallery.xhp
diff --git a/helpcontent2/source/text/swriter/guide/insert_graphic_scan.xhp b/helpcontent2/source/text/swriter/guide/insert_graphic_scan.xhp
index 7880116537..7880116537 100755..100644
--- a/helpcontent2/source/text/swriter/guide/insert_graphic_scan.xhp
+++ b/helpcontent2/source/text/swriter/guide/insert_graphic_scan.xhp
diff --git a/helpcontent2/source/text/swriter/guide/insert_tab_innumbering.xhp b/helpcontent2/source/text/swriter/guide/insert_tab_innumbering.xhp
index fe8e2d8f81..fe8e2d8f81 100755..100644
--- a/helpcontent2/source/text/swriter/guide/insert_tab_innumbering.xhp
+++ b/helpcontent2/source/text/swriter/guide/insert_tab_innumbering.xhp
diff --git a/helpcontent2/source/text/swriter/guide/join_numbered_lists.xhp b/helpcontent2/source/text/swriter/guide/join_numbered_lists.xhp
index 649e2179d8..649e2179d8 100755..100644
--- a/helpcontent2/source/text/swriter/guide/join_numbered_lists.xhp
+++ b/helpcontent2/source/text/swriter/guide/join_numbered_lists.xhp
diff --git a/helpcontent2/source/text/swriter/guide/jump2statusbar.xhp b/helpcontent2/source/text/swriter/guide/jump2statusbar.xhp
index ab0a5d9b77..ab0a5d9b77 100755..100644
--- a/helpcontent2/source/text/swriter/guide/jump2statusbar.xhp
+++ b/helpcontent2/source/text/swriter/guide/jump2statusbar.xhp
diff --git a/helpcontent2/source/text/swriter/guide/keyboard.xhp b/helpcontent2/source/text/swriter/guide/keyboard.xhp
index 3f56e3ae11..3f56e3ae11 100755..100644
--- a/helpcontent2/source/text/swriter/guide/keyboard.xhp
+++ b/helpcontent2/source/text/swriter/guide/keyboard.xhp
diff --git a/helpcontent2/source/text/swriter/guide/main.xhp b/helpcontent2/source/text/swriter/guide/main.xhp
index 652421d4df..652421d4df 100755..100644
--- a/helpcontent2/source/text/swriter/guide/main.xhp
+++ b/helpcontent2/source/text/swriter/guide/main.xhp
diff --git a/helpcontent2/source/text/swriter/guide/navigator.xhp b/helpcontent2/source/text/swriter/guide/navigator.xhp
index ad5f1e748d..ad5f1e748d 100755..100644
--- a/helpcontent2/source/text/swriter/guide/navigator.xhp
+++ b/helpcontent2/source/text/swriter/guide/navigator.xhp
diff --git a/helpcontent2/source/text/swriter/guide/number_date_conv.xhp b/helpcontent2/source/text/swriter/guide/number_date_conv.xhp
index 00ba4be36d..00ba4be36d 100755..100644
--- a/helpcontent2/source/text/swriter/guide/number_date_conv.xhp
+++ b/helpcontent2/source/text/swriter/guide/number_date_conv.xhp
diff --git a/helpcontent2/source/text/swriter/guide/numbering_paras.xhp b/helpcontent2/source/text/swriter/guide/numbering_paras.xhp
index 8373dbfd81..8373dbfd81 100755..100644
--- a/helpcontent2/source/text/swriter/guide/numbering_paras.xhp
+++ b/helpcontent2/source/text/swriter/guide/numbering_paras.xhp
diff --git a/helpcontent2/source/text/swriter/guide/page_break.xhp b/helpcontent2/source/text/swriter/guide/page_break.xhp
index c39ea004a5..c39ea004a5 100755..100644
--- a/helpcontent2/source/text/swriter/guide/page_break.xhp
+++ b/helpcontent2/source/text/swriter/guide/page_break.xhp
diff --git a/helpcontent2/source/text/swriter/guide/pagebackground.xhp b/helpcontent2/source/text/swriter/guide/pagebackground.xhp
index 2b4a59c41e..2b4a59c41e 100755..100644
--- a/helpcontent2/source/text/swriter/guide/pagebackground.xhp
+++ b/helpcontent2/source/text/swriter/guide/pagebackground.xhp
diff --git a/helpcontent2/source/text/swriter/guide/pagenumbers.xhp b/helpcontent2/source/text/swriter/guide/pagenumbers.xhp
index 22cf939232..22cf939232 100755..100644
--- a/helpcontent2/source/text/swriter/guide/pagenumbers.xhp
+++ b/helpcontent2/source/text/swriter/guide/pagenumbers.xhp
diff --git a/helpcontent2/source/text/swriter/guide/pageorientation.xhp b/helpcontent2/source/text/swriter/guide/pageorientation.xhp
index 1459a29d02..1459a29d02 100755..100644
--- a/helpcontent2/source/text/swriter/guide/pageorientation.xhp
+++ b/helpcontent2/source/text/swriter/guide/pageorientation.xhp
diff --git a/helpcontent2/source/text/swriter/guide/pagestyles.xhp b/helpcontent2/source/text/swriter/guide/pagestyles.xhp
index ae06c70292..ae06c70292 100755..100644
--- a/helpcontent2/source/text/swriter/guide/pagestyles.xhp
+++ b/helpcontent2/source/text/swriter/guide/pagestyles.xhp
diff --git a/helpcontent2/source/text/swriter/guide/printing_order.xhp b/helpcontent2/source/text/swriter/guide/printing_order.xhp
index 73f1b2e0a8..73f1b2e0a8 100755..100644
--- a/helpcontent2/source/text/swriter/guide/printing_order.xhp
+++ b/helpcontent2/source/text/swriter/guide/printing_order.xhp
diff --git a/helpcontent2/source/text/swriter/guide/references.xhp b/helpcontent2/source/text/swriter/guide/references.xhp
index d3c6bb077f..d3c6bb077f 100755..100644
--- a/helpcontent2/source/text/swriter/guide/references.xhp
+++ b/helpcontent2/source/text/swriter/guide/references.xhp
diff --git a/helpcontent2/source/text/swriter/guide/registertrue.xhp b/helpcontent2/source/text/swriter/guide/registertrue.xhp
index 842496e964..842496e964 100755..100644
--- a/helpcontent2/source/text/swriter/guide/registertrue.xhp
+++ b/helpcontent2/source/text/swriter/guide/registertrue.xhp
diff --git a/helpcontent2/source/text/swriter/guide/reset_format.xhp b/helpcontent2/source/text/swriter/guide/reset_format.xhp
index 45166aa5e3..7abc83116f 100755..100644
--- a/helpcontent2/source/text/swriter/guide/reset_format.xhp
+++ b/helpcontent2/source/text/swriter/guide/reset_format.xhp
@@ -51,14 +51,14 @@
 </variable></paragraph>
       <list type="unordered">
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3154091" role="listitem" l10n="U" oldref="27">You can quickly exit manual formatting by pressing the right-arrow key. For example, if you have pressed Ctrl+B to apply the bold typeface to the text that you type, press the right arrow to return to the default character format of the paragraph.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3154091" role="listitem" l10n="U" oldref="27">You can quickly exit manual formatting by pressing Ctrl+Shift+X. For example, if you have pressed Ctrl+B to apply the bold typeface to the text that you type, press Ctrl+Shift+X to return to the default character format of the paragraph.</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3155854" role="listitem" l10n="CHG" oldref="28">To reset all direct formatting of existing text, select that text, then choose the menu command <emph>Format - Default Formatting</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3155854" role="listitem" l10n="CHG" oldref="28">To reset all direct formatting of existing text, select that text, then choose the menu command <emph>Format - Clear Direct Formatting</emph>.</paragraph>
          </listitem>
       </list>
       <embed href="text/shared/00/00000004.xhp#related"/>
       <embed href="text/swriter/guide/text_emphasize.xhp#text_emphasize"/>
       <embed href="text/swriter/guide/shortcut_writing.xhp#shortcut_writing"/>
    </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/swriter/guide/resize_navigator.xhp b/helpcontent2/source/text/swriter/guide/resize_navigator.xhp
index a64a90323b..a64a90323b 100755..100644
--- a/helpcontent2/source/text/swriter/guide/resize_navigator.xhp
+++ b/helpcontent2/source/text/swriter/guide/resize_navigator.xhp
diff --git a/helpcontent2/source/text/swriter/guide/search_regexp.xhp b/helpcontent2/source/text/swriter/guide/search_regexp.xhp
index cdeeae9b62..f562a4e3b4 100755..100644
--- a/helpcontent2/source/text/swriter/guide/search_regexp.xhp
+++ b/helpcontent2/source/text/swriter/guide/search_regexp.xhp
@@ -10,9 +10,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/swriter/guide/section_edit.xhp b/helpcontent2/source/text/swriter/guide/section_edit.xhp
index 90f09917ee..90f09917ee 100755..100644
--- a/helpcontent2/source/text/swriter/guide/section_edit.xhp
+++ b/helpcontent2/source/text/swriter/guide/section_edit.xhp
diff --git a/helpcontent2/source/text/swriter/guide/section_insert.xhp b/helpcontent2/source/text/swriter/guide/section_insert.xhp
index 7566d0563d..7566d0563d 100755..100644
--- a/helpcontent2/source/text/swriter/guide/section_insert.xhp
+++ b/helpcontent2/source/text/swriter/guide/section_insert.xhp
diff --git a/helpcontent2/source/text/swriter/guide/send2html.xhp b/helpcontent2/source/text/swriter/guide/send2html.xhp
index 141fa5a5fd..141fa5a5fd 100755..100644
--- a/helpcontent2/source/text/swriter/guide/send2html.xhp
+++ b/helpcontent2/source/text/swriter/guide/send2html.xhp
diff --git a/helpcontent2/source/text/swriter/guide/shortcut_writing.xhp b/helpcontent2/source/text/swriter/guide/shortcut_writing.xhp
index 7a4618085d..7a4618085d 100755..100644
--- a/helpcontent2/source/text/swriter/guide/shortcut_writing.xhp
+++ b/helpcontent2/source/text/swriter/guide/shortcut_writing.xhp
diff --git a/helpcontent2/source/text/swriter/guide/stylist_fillformat.xhp b/helpcontent2/source/text/swriter/guide/stylist_fillformat.xhp
index a535d10951..15e3ed33e3 100644
--- a/helpcontent2/source/text/swriter/guide/stylist_fillformat.xhp
+++ b/helpcontent2/source/text/swriter/guide/stylist_fillformat.xhp
@@ -58,7 +58,7 @@
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3145090" role="listitem" l10n="U" oldref="17">Click the style, and then click the <item type="menuitem">Fill Format Mode</item> icon 
-<image id="img_id3149644" src="res/commandimagelist/sc_fillstyle.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3149644">Icon</alt>
+<image id="img_id3149644" src="cmd/sc_fillstyle.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3149644">Icon</alt>
 	</image> in the <item type="menuitem">Styles and Formatting</item> window.</paragraph>
          </listitem>
          <listitem>
diff --git a/helpcontent2/source/text/swriter/guide/subscript.xhp b/helpcontent2/source/text/swriter/guide/subscript.xhp
index aab232ac1a..aab232ac1a 100755..100644
--- a/helpcontent2/source/text/swriter/guide/subscript.xhp
+++ b/helpcontent2/source/text/swriter/guide/subscript.xhp
diff --git a/helpcontent2/source/text/swriter/guide/table_cells.xhp b/helpcontent2/source/text/swriter/guide/table_cells.xhp
index 84b8d9ef40..84b8d9ef40 100755..100644
--- a/helpcontent2/source/text/swriter/guide/table_cells.xhp
+++ b/helpcontent2/source/text/swriter/guide/table_cells.xhp
diff --git a/helpcontent2/source/text/swriter/guide/table_delete.xhp b/helpcontent2/source/text/swriter/guide/table_delete.xhp
index 529bf9dc87..529bf9dc87 100755..100644
--- a/helpcontent2/source/text/swriter/guide/table_delete.xhp
+++ b/helpcontent2/source/text/swriter/guide/table_delete.xhp
diff --git a/helpcontent2/source/text/swriter/guide/table_insert.xhp b/helpcontent2/source/text/swriter/guide/table_insert.xhp
index df9caad445..df9caad445 100755..100644
--- a/helpcontent2/source/text/swriter/guide/table_insert.xhp
+++ b/helpcontent2/source/text/swriter/guide/table_insert.xhp
diff --git a/helpcontent2/source/text/swriter/guide/table_repeat_multiple_headers.xhp b/helpcontent2/source/text/swriter/guide/table_repeat_multiple_headers.xhp
index acb03f2dd7..acb03f2dd7 100755..100644
--- a/helpcontent2/source/text/swriter/guide/table_repeat_multiple_headers.xhp
+++ b/helpcontent2/source/text/swriter/guide/table_repeat_multiple_headers.xhp
diff --git a/helpcontent2/source/text/swriter/guide/table_sizing.xhp b/helpcontent2/source/text/swriter/guide/table_sizing.xhp
index bde82f10f1..e5e6796746 100644
--- a/helpcontent2/source/text/swriter/guide/table_sizing.xhp
+++ b/helpcontent2/source/text/swriter/guide/table_sizing.xhp
@@ -54,7 +54,7 @@
 <tablerow>
 <tablecell>
 <paragraph id="par_id3149615" role="paragraph" xml-lang="en-US">
-<image id="img_id3149622" src="res/commandimagelist/sc_optimizetable.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3149622">Icon</alt>
+<image id="img_id3149622" src="cmd/sc_optimizetable.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3149622">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/swriter/guide/tablemode.xhp b/helpcontent2/source/text/swriter/guide/tablemode.xhp
index 1c04e98742..1c04e98742 100755..100644
--- a/helpcontent2/source/text/swriter/guide/tablemode.xhp
+++ b/helpcontent2/source/text/swriter/guide/tablemode.xhp
diff --git a/helpcontent2/source/text/swriter/guide/template_create.xhp b/helpcontent2/source/text/swriter/guide/template_create.xhp
index 84fde465a8..84fde465a8 100755..100644
--- a/helpcontent2/source/text/swriter/guide/template_create.xhp
+++ b/helpcontent2/source/text/swriter/guide/template_create.xhp
diff --git a/helpcontent2/source/text/swriter/guide/template_default.xhp b/helpcontent2/source/text/swriter/guide/template_default.xhp
index 456f09d541..456f09d541 100755..100644
--- a/helpcontent2/source/text/swriter/guide/template_default.xhp
+++ b/helpcontent2/source/text/swriter/guide/template_default.xhp
diff --git a/helpcontent2/source/text/swriter/guide/text_animation.xhp b/helpcontent2/source/text/swriter/guide/text_animation.xhp
index db7ff4bb14..db7ff4bb14 100755..100644
--- a/helpcontent2/source/text/swriter/guide/text_animation.xhp
+++ b/helpcontent2/source/text/swriter/guide/text_animation.xhp
diff --git a/helpcontent2/source/text/swriter/guide/text_capital.xhp b/helpcontent2/source/text/swriter/guide/text_capital.xhp
index d5f4737585..d5f4737585 100755..100644
--- a/helpcontent2/source/text/swriter/guide/text_capital.xhp
+++ b/helpcontent2/source/text/swriter/guide/text_capital.xhp
diff --git a/helpcontent2/source/text/swriter/guide/text_direct_cursor.xhp b/helpcontent2/source/text/swriter/guide/text_direct_cursor.xhp
index e8c47d25c3..02a37de22d 100644
--- a/helpcontent2/source/text/swriter/guide/text_direct_cursor.xhp
+++ b/helpcontent2/source/text/swriter/guide/text_direct_cursor.xhp
@@ -51,7 +51,7 @@
       <list type="ordered">
          <listitem>
             <paragraph xml-lang="en-US" id="par_idN106A3" role="listitem" l10n="NEW">On the <item type="menuitem">Tools</item> bar, click the <item type="menuitem">Direct Cursor</item> icon 
-<image id="img_id3149846" src="res/commandimagelist/sc_shadowcursor.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3149846">Icon</alt></image>.</paragraph>
+<image id="img_id3149846" src="cmd/sc_shadowcursor.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3149846">Icon</alt></image>.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_idN106C5" role="listitem" l10n="NEW">Click in a free space in the text document. The mouse pointer changes to reflect the alignment that will be applied to the text that you type:</paragraph>
diff --git a/helpcontent2/source/text/swriter/guide/text_frame.xhp b/helpcontent2/source/text/swriter/guide/text_frame.xhp
index 1e5b4514b8..d8a2f89d05 100644
--- a/helpcontent2/source/text/swriter/guide/text_frame.xhp
+++ b/helpcontent2/source/text/swriter/guide/text_frame.xhp
@@ -97,7 +97,7 @@
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3150223" role="listitem" l10n="CHG" oldref="87">On the <item type="menuitem">Frame</item> Bar, click the <item type="menuitem">Link Frames</item> icon 
-<image id="img_id3148968" src="res/commandimagelist/sc_chainframes.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3148968">Icon</alt>
+<image id="img_id3148968" src="cmd/sc_chainframes.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3148968">Icon</alt>
 	</image>.</paragraph>
          </listitem>
          <listitem>
diff --git a/helpcontent2/source/text/swriter/guide/text_nav_keyb.xhp b/helpcontent2/source/text/swriter/guide/text_nav_keyb.xhp
index 43b63aa773..43b63aa773 100755..100644
--- a/helpcontent2/source/text/swriter/guide/text_nav_keyb.xhp
+++ b/helpcontent2/source/text/swriter/guide/text_nav_keyb.xhp
diff --git a/helpcontent2/source/text/swriter/guide/text_rotate.xhp b/helpcontent2/source/text/swriter/guide/text_rotate.xhp
index 48301c9cff..5d1044feb6 100644
--- a/helpcontent2/source/text/swriter/guide/text_rotate.xhp
+++ b/helpcontent2/source/text/swriter/guide/text_rotate.xhp
@@ -52,7 +52,7 @@
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3149866" role="listitem" l10n="CHG" oldref="68">Select the <link href="text/shared/02/01140000.xhp" name="Text"><item type="menuitem">Text</item></link> icon 
-<image id="img_id3149600" src="res/commandimagelist/sc_texttoolbox.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3149600">Icon</alt>
+<image id="img_id3149600" src="cmd/sc_texttoolbox.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3149600">Icon</alt>
 	</image>.</paragraph>
          </listitem>
          <listitem>
@@ -60,7 +60,7 @@
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3154415" role="listitem" l10n="CHG" oldref="71">Click outside of the object, then click the text you entered. Click the <link href="text/shared/02/05090000.xhp" name="Object Rotation Mode"><item type="menuitem">Rotate</item></link> icon 
-<image id="img_id3145405" src="res/commandimagelist/sc_toggleobjectrotatemode.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3145405">Icon</alt>
+<image id="img_id3145405" src="cmd/sc_toggleobjectrotatemode.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3145405">Icon</alt>
 	</image> on the <item type="menuitem">Drawing Object Properties</item> toolbar.</paragraph>
          </listitem>
          <listitem>
diff --git a/helpcontent2/source/text/swriter/guide/textdoc_inframe.xhp b/helpcontent2/source/text/swriter/guide/textdoc_inframe.xhp
index 1f60820ff0..1f60820ff0 100755..100644
--- a/helpcontent2/source/text/swriter/guide/textdoc_inframe.xhp
+++ b/helpcontent2/source/text/swriter/guide/textdoc_inframe.xhp
diff --git a/helpcontent2/source/text/swriter/guide/using_numbered_lists.xhp b/helpcontent2/source/text/swriter/guide/using_numbered_lists.xhp
index fcf05e2b81..ccbe23c3ee 100644
--- a/helpcontent2/source/text/swriter/guide/using_numbered_lists.xhp
+++ b/helpcontent2/source/text/swriter/guide/using_numbered_lists.xhp
@@ -54,7 +54,7 @@
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3149635" role="listitem" l10n="CHG" oldref="16">On the <item type="menuitem">Formatting</item> Bar, click the <item type="menuitem">Bullets On/Off</item> icon 
-<image id="img_id3156108" src="res/commandimagelist/sc_defaultbullet.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3156108">Icon</alt>
+<image id="img_id3156108" src="cmd/sc_defaultbullet.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3156108">Icon</alt>
 	</image>.</paragraph>
          </listitem>
       </list>
diff --git a/helpcontent2/source/text/swriter/guide/using_numbered_lists2.xhp b/helpcontent2/source/text/swriter/guide/using_numbered_lists2.xhp
index 32d1aa1e21..a65a9d63dc 100644
--- a/helpcontent2/source/text/swriter/guide/using_numbered_lists2.xhp
+++ b/helpcontent2/source/text/swriter/guide/using_numbered_lists2.xhp
@@ -54,7 +54,7 @@
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3149968" role="listitem" l10n="CHG" oldref="24">On the <item type="menuitem">Formatting</item> Bar, click the <item type="menuitem">Numbering On/Off</item> icon 
-<image id="img_id3153125" src="res/commandimagelist/sc_defaultnumbering.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153125">Icon</alt>
+<image id="img_id3153125" src="cmd/sc_defaultnumbering.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153125">Icon</alt>
 	</image>.</paragraph>
          </listitem>
          <listitem>
diff --git a/helpcontent2/source/text/swriter/guide/word_completion.xhp b/helpcontent2/source/text/swriter/guide/word_completion.xhp
index 8e52543a18..8e52543a18 100755..100644
--- a/helpcontent2/source/text/swriter/guide/word_completion.xhp
+++ b/helpcontent2/source/text/swriter/guide/word_completion.xhp
diff --git a/helpcontent2/source/text/swriter/guide/words_count.xhp b/helpcontent2/source/text/swriter/guide/words_count.xhp
index bf33aedb3c..55ac85c5bd 100755..100644
--- a/helpcontent2/source/text/swriter/guide/words_count.xhp
+++ b/helpcontent2/source/text/swriter/guide/words_count.xhp
@@ -58,7 +58,7 @@
          </listitem>
       </list>
       <section id="how">
-         <paragraph xml-lang="en-US" id="hd_id1116200901133957" role="heading" level="2" l10n="NEW">How does $PRODUCTNAME count words?</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id1116200901133957" role="heading" level="2" l10n="NEW">How does %PRODUCTNAME count words?</paragraph>
          <paragraph xml-lang="en-US" id="par_id1116200901133998" role="paragraph" l10n="NEW">In general, every string of characters between two spaces is a word. Tabs, line breaks, and paragraph breaks are word limits, too.</paragraph>
          <paragraph xml-lang="en-US" id="par_id1116200901133985" role="paragraph" l10n="NEW">Words with dashes or always visible hyphens, as in plug-in, add-on, user/config, are counted as one word each.</paragraph>
          <paragraph xml-lang="en-US" id="par_id111620090113399" role="paragraph" l10n="NEW">The words can be a mix of letters, numbers, and special characters. So the following text counts as four words: abc123 1.23 "$" http://www.example.com.</paragraph>
@@ -67,4 +67,4 @@
       <embed href="text/shared/00/00000004.xhp#related"/>
       <paragraph xml-lang="en-US" id="par_id3147418" role="paragraph" l10n="U" oldref="4"><link href="text/shared/01/01100400.xhp" name="File - Properties - Statistics">File - Properties - Statistics</link></paragraph>
    </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/swriter/main0102.xhp b/helpcontent2/source/text/swriter/main0102.xhp
index 8c1684b9c4..8c1684b9c4 100755..100644
--- a/helpcontent2/source/text/swriter/main0102.xhp
+++ b/helpcontent2/source/text/swriter/main0102.xhp
diff --git a/helpcontent2/source/text/swriter/main0103.xhp b/helpcontent2/source/text/swriter/main0103.xhp
index ac5657d92b..ac5657d92b 100755..100644
--- a/helpcontent2/source/text/swriter/main0103.xhp
+++ b/helpcontent2/source/text/swriter/main0103.xhp
diff --git a/helpcontent2/source/text/swriter/main0104.xhp b/helpcontent2/source/text/swriter/main0104.xhp
index 5510378888..5510378888 100755..100644
--- a/helpcontent2/source/text/swriter/main0104.xhp
+++ b/helpcontent2/source/text/swriter/main0104.xhp
diff --git a/helpcontent2/source/text/swriter/main0106.xhp b/helpcontent2/source/text/swriter/main0106.xhp
index 9e47acbb77..9e47acbb77 100755..100644
--- a/helpcontent2/source/text/swriter/main0106.xhp
+++ b/helpcontent2/source/text/swriter/main0106.xhp
diff --git a/helpcontent2/source/text/swriter/main0110.xhp b/helpcontent2/source/text/swriter/main0110.xhp
index bc84c83fd7..bc84c83fd7 100755..100644
--- a/helpcontent2/source/text/swriter/main0110.xhp
+++ b/helpcontent2/source/text/swriter/main0110.xhp
diff --git a/helpcontent2/source/text/swriter/main0200.xhp b/helpcontent2/source/text/swriter/main0200.xhp
index a86e3b4e62..e1264c2bc7 100755..100644
--- a/helpcontent2/source/text/swriter/main0200.xhp
+++ b/helpcontent2/source/text/swriter/main0200.xhp
@@ -78,9 +78,6 @@
 <section id="Section11">
 <embed href="text/swriter/main0208.xhp#status"/>
 </section>
-<section id="Section13">
-<embed href="text/shared/main0209.xhp#hyperlink"/>
-</section>
 <section id="Section14">
 <embed href="text/swriter/main0210.xhp#seitenansicht"/>
 </section>
diff --git a/helpcontent2/source/text/swriter/main0202.xhp b/helpcontent2/source/text/swriter/main0202.xhp
index 057b6f4984..fdc1459d9b 100644
--- a/helpcontent2/source/text/swriter/main0202.xhp
+++ b/helpcontent2/source/text/swriter/main0202.xhp
@@ -98,7 +98,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_idN10784" role="tablecontent" l10n="NEW">
-<image id="img_id8354747" src="res/commandimagelist/sc_paralefttoright.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id8354747">left to right icon</alt>
+<image id="img_id8354747" src="cmd/sc_paralefttoright.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id8354747">left to right icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
@@ -115,7 +115,7 @@
          <tablerow>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_idN107DF" role="tablecontent" l10n="NEW">
-<image id="img_id2405774" src="res/commandimagelist/sc_pararighttoleft.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id2405774">right to left icon</alt>
+<image id="img_id2405774" src="cmd/sc_pararighttoleft.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id2405774">right to left icon</alt>
 	</image></paragraph>
             </tablecell>
             <tablecell>
diff --git a/helpcontent2/source/text/swriter/main0203.xhp b/helpcontent2/source/text/swriter/main0203.xhp
index 8b0551d70e..8b0551d70e 100755..100644
--- a/helpcontent2/source/text/swriter/main0203.xhp
+++ b/helpcontent2/source/text/swriter/main0203.xhp
diff --git a/helpcontent2/source/text/swriter/main0204.xhp b/helpcontent2/source/text/swriter/main0204.xhp
index 8e773b4883..8e773b4883 100755..100644
--- a/helpcontent2/source/text/swriter/main0204.xhp
+++ b/helpcontent2/source/text/swriter/main0204.xhp
diff --git a/helpcontent2/source/text/swriter/main0205.xhp b/helpcontent2/source/text/swriter/main0205.xhp
index 878e88d75b..878e88d75b 100755..100644
--- a/helpcontent2/source/text/swriter/main0205.xhp
+++ b/helpcontent2/source/text/swriter/main0205.xhp
diff --git a/helpcontent2/source/text/swriter/main0206.xhp b/helpcontent2/source/text/swriter/main0206.xhp
index 7078058505..7078058505 100755..100644
--- a/helpcontent2/source/text/swriter/main0206.xhp
+++ b/helpcontent2/source/text/swriter/main0206.xhp
diff --git a/helpcontent2/source/text/swriter/main0208.xhp b/helpcontent2/source/text/swriter/main0208.xhp
index 30d6350e13..30d6350e13 100755..100644
--- a/helpcontent2/source/text/swriter/main0208.xhp
+++ b/helpcontent2/source/text/swriter/main0208.xhp
diff --git a/helpcontent2/source/text/swriter/main0213.xhp b/helpcontent2/source/text/swriter/main0213.xhp
index ae80cb0024..ae80cb0024 100755..100644
--- a/helpcontent2/source/text/swriter/main0213.xhp
+++ b/helpcontent2/source/text/swriter/main0213.xhp
diff --git a/helpcontent2/source/text/swriter/main0215.xhp b/helpcontent2/source/text/swriter/main0215.xhp
index 8e8eca4fae..8e8eca4fae 100755..100644
--- a/helpcontent2/source/text/swriter/main0215.xhp
+++ b/helpcontent2/source/text/swriter/main0215.xhp
diff --git a/helpcontent2/source/text/swriter/main0216.xhp b/helpcontent2/source/text/swriter/main0216.xhp
index c1c57164c9..c1c57164c9 100755..100644
--- a/helpcontent2/source/text/swriter/main0216.xhp
+++ b/helpcontent2/source/text/swriter/main0216.xhp
diff --git a/helpcontent2/source/text/swriter/main0220.xhp b/helpcontent2/source/text/swriter/main0220.xhp
index 49b85e453d..49b85e453d 100755..100644
--- a/helpcontent2/source/text/swriter/main0220.xhp
+++ b/helpcontent2/source/text/swriter/main0220.xhp
diff --git a/helpcontent2/source/text/swriter/main0503.xhp b/helpcontent2/source/text/swriter/main0503.xhp
index 6eb904e578..6eb904e578 100755..100644
--- a/helpcontent2/source/text/swriter/main0503.xhp
+++ b/helpcontent2/source/text/swriter/main0503.xhp
diff --git a/helpcontent2/to-wiki/getalltitles.py b/helpcontent2/to-wiki/getalltitles.py
new file mode 100755
index 0000000000..18a2dc0828
--- /dev/null
+++ b/helpcontent2/to-wiki/getalltitles.py
@@ -0,0 +1,147 @@
+#!/usr/bin/env python
+
+import sys
+import os
+import xml.parsers.expat
+
+alltitles=[]
+
+def is_present(title):
+    for i in alltitles:
+        try:
+            if i.strip() == title.strip():
+                return True
+        except:
+            return False
+    return False
+
+def make_unique(title):
+    n=0
+    t = title
+    while is_present(t):
+        n=n+1
+        t = title+"_%d"%(n)
+    return t
+
+replace_text_list = [
+        ["$[officename]",""], # to fit both LibreOffice and BrOffice
+        ["%PRODUCTNAME",""], # to fit both LibreOffice and BrOffice
+        ["$PRODUCTNAME",""], # to fit both LibreOffice and BrOffice
+        ['"+"',"Plus"],
+        ['"*"',"Star"],
+        ['"-"',"Minus"],
+        ['"/"',"Slash"],
+        ['"^"',"Cap"],
+        ['#',"No"],
+        [')','_'],
+        ['(','_'],
+        [']','_'],
+        ['[','_'],
+        ['\\','_'],
+        ['/','_'],
+        ['&',"and"],
+        [';','_']
+        ]
+
+replace_readable_list = [
+        ["$[officename]","{{ProductName}}"],
+        ["%PRODUCTNAME","{{ProductName}}"],
+        ["$PRODUCTNAME","{{ProductName}}"]
+        ]
+
+modules_list = [
+        ["sbasic","Basic"],
+        ["scalc","Calc"],
+        ["schart","Chart"],
+        ["sdraw","Draw"],
+        ["simpress","Impress"],
+        ["smath","Math"],
+        ["swriter","Writer"],
+        ["shared","Common"]
+        ]
+
+def get_module(text):
+    for i in modules_list:
+        if text.find('/' + i[0] + '/') >=0:
+            return i[1]
+    return ""
+
+def replace_text(text, replace_list):
+    for i in replace_list:
+        if text.find(i[0]) >= 0:
+            text = text.replace(i[0],i[1])
+    return text
+
+def wiki_text(text):
+    t = replace_text(text, replace_text_list)
+    if t == '':
+        t = 'LibreOffice' # hardcoded fallback
+    return t.strip()
+
+def readable_text(text):
+    return replace_text(text, replace_readable_list)
+
+class TitleParser:
+    title = ''
+    is_title = False
+
+    def start_element(self, name, attrs):
+        if name == 'title':
+            self.is_title = True
+
+    def end_element(self, name):
+        if name == 'title':
+            self.is_title = False
+
+    def char_data(self, data):
+        if self.is_title:
+            self.title = self.title + data
+
+    def get_title(self):
+        return self.title.strip()
+
+def parsexhp(filename):
+    module = get_module(filename)
+    if module == '':
+        return
+
+    parsing = True
+    file=open(filename,"r")
+    p = xml.parsers.expat.ParserCreate()
+    tp = TitleParser()
+    p.StartElementHandler = tp.start_element
+    p.EndElementHandler = tp.end_element
+    p.CharacterDataHandler = tp.char_data
+    buf = file.read()
+    try:
+        p.Parse(buf)
+    except:
+        sys.stderr.write('Cannot parse %s, skipping it\n'% filename)
+        file.close()
+        return
+    file.close()
+    title = tp.get_title()
+    if len(title) > 0:
+        readable_title = readable_text(title)
+        title = module + '/' + wiki_text(title)
+        title = title.replace(' ', '_')
+        title = title.replace('___', '_')
+        title = title.replace('__', '_')
+        title = title.strip('_')
+        title = make_unique(title)
+        alltitles.append(title)
+        print filename + ';' + title + ';' + readable_title
+
+if len(sys.argv) < 2:
+    print "getalltitles.py <directory>"
+    print "e.g. getalltitles.py source/text/scalc"
+    sys.exit(1)
+
+pattern = "xhp"
+
+for root, dirs, files in os.walk(sys.argv[1]):
+    for i in files:
+        if i.find(pattern) >= 0:
+            parsexhp(root+"/"+i)
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/helpcontent2/to-wiki/wikiconv2.py b/helpcontent2/to-wiki/wikiconv2.py
new file mode 100755
index 0000000000..d4b3a5e235
--- /dev/null
+++ b/helpcontent2/to-wiki/wikiconv2.py
@@ -0,0 +1,1343 @@
+#!/usr/bin/env python
+
+import os, sys, thread, threading, time
+import xml.parsers.expat
+import codecs
+from threading import Thread
+
+root="source/"
+max_threads = 25
+
+titles = []
+
+# map of id -> localized text
+localization_data = {}
+
+# content of the hid.lst file for easier searching
+hid_lst = {}
+
+# to collect a list of pages that will be redirections to the pages with nice
+# names
+redirects = []
+
+# to collect images that we will up-load later
+images = set()
+
+# various types of paragraphs
+replace_paragraph_role = \
+    {'start':{'code': '<code>',
+              'codeintip': '<code>',
+              'emph' : '', # must be empty to be able to strip empty <emph/>
+              'example': '<code>',
+              'heading1': '= ',
+              'heading2': '== ',
+              'heading3': '=== ',
+              'heading4': '==== ',
+              'heading5': '===== ',
+              'heading6': '====== ',
+              'head1': '= ', # used only in one file, probably in error?
+              'head2': '== ', # used only in one file, probably in error?
+              'listitem': '',
+              'note': '{{Note|',
+              'null': '', # special paragraph for Variable, CaseInline, etc.
+              'paragraph': '',
+              'related': '', # used only in one file, probably in error?
+              'relatedtopics': '', # used only in one file, probably in error?
+              'tablecontent': '| ',
+              'tablecontentcode': '| <code>',
+              'tablehead': '! scope="col" | ',
+              'tablenextpara': '\n',
+              'tablenextparacode': '\n<code>',
+              'tip': '{{Tip|',
+              'variable': '',
+              'warning': '{{Warning|',
+             },
+     'end':{'code': '</code>\n\n',
+            'codeintip': '</code>\n\n',
+            'emph' : '',
+            'example': '</code>\n\n',
+            'heading1': ' =\n\n',
+            'heading2': ' ==\n\n',
+            'heading3': ' ===\n\n',
+            'heading4': ' ====\n\n',
+            'heading5': ' =====\n\n',
+            'heading6': ' ======\n\n',
+            'head1': ' =\n\n', # used only in one file, probably in error?
+            'head2': ' ==\n\n', # used only in one file, probably in error?
+            'listitem': '',
+            'note': '}}\n\n',
+            'null': '', # special paragraph for Variable, CaseInline, etc.
+            'paragraph': '\n\n',
+            'related': '\n\n', # used only in one file, probably in error?
+            'relatedtopics': '\n\n', # used only in one file, probably in error?
+            'tablecontent': '\n',
+            'tablecontentcode': '</code>\n',
+            'tablehead': '\n',
+            'tablenextpara': '\n',
+            'tablenextparacode': '</code>\n',
+            'tip': '}}\n\n',
+            'variable': '',
+            'warning': '}}\n\n',
+           },
+     'templ':{'code': False,
+              'codeintip': False,
+              'emph' : False,
+              'example': False,
+              'heading1': False,
+              'heading2': False,
+              'heading3': False,
+              'heading4': False,
+              'heading5': False,
+              'heading6': False,
+              'head1': False,
+              'head2': False,
+              'listitem': False,
+              'note': True,
+              'null': False,
+              'paragraph': False,
+              'related': False,
+              'relatedtopics': False,
+              'tablecontent': False,
+              'tablecontentcode': False,
+              'tablehead': False,
+              'tablenextpara': False,
+              'tablenextparacode': False,
+              'tip': True,
+              'variable': False,
+              'warning': True,
+           }
+    }
+
+section_id_mapping = \
+    {'relatedtopics': 'RelatedTopics'}
+
+# text snippets that we need to convert
+replace_text_list = \
+    [["$[officename]", "{{ProductName}}"],
+     ["%PRODUCTNAME", "{{ProductName}}"],
+     ["$PRODUCTNAME", "{{ProductName}}"]
+    ]
+
+def load_hid_lst():
+    global hid_lst
+    hid_lst = {}
+    file = codecs.open("helpers/hid.lst", "r", "utf-8")
+    for line in file:
+        ids = line.strip().split(" ")
+        if len(ids) == 2:
+            hid_lst[ids[0].upper()] = ids[1]
+    file.close()
+
+def get_link_filename(link, name):
+    text = link.strip()
+    fragment = ''
+    if text.find('http') == 0:
+        text = name
+    else:
+        f = text.find('#')
+        if f >= 0:
+            fragment = text[f:]
+            text = text[0:f]
+
+    for title in titles:
+        try:
+            if title[0].find(text) >= 0:
+                return (title[1].strip(), fragment)
+        except:
+            pass
+    return (link, '')
+
+def replace_text(text):
+    for i in replace_text_list:
+        if text.find(i[0]) >= 0:
+            text = text.replace(i[0],i[1])
+    return text
+
+# modify the text so that in templates like {{Name|something}}, the 'something'
+# does not look like template params
+def escape_equals_sign(text):
+    depth = 0
+    t = ''
+    for i in text:
+        if i == '=':
+            if depth == 0:
+                t = t + '&#61;'
+            else:
+                t = t + '='
+        else:
+            t = t + i
+            if i == '{' or i == '[' or i == '<':
+                depth = depth + 1
+            elif i == '}' or i == ']' or i == '>':
+                depth = depth - 1
+                if depth < 0:
+                    depth = 0
+
+    return t
+
+def load_localization_data(sdf_file):
+    global localization_data
+    localization_data = {}
+    try:
+        file = codecs.open(sdf_file, "r", "utf-8")
+    except:
+        sys.stderr.write('Error: Cannot open .sdf file "%s"\n'% sdf_file)
+        return False
+
+    for line in file:
+        line = line.strip()
+        if line[0] == '#':
+            continue
+        spl = line.split("\t")
+
+        # the form of the key is like
+        # source/text/shared/explorer/database/02010100.xhp#hd_id3149233
+        # otherwise we are getting duplicates
+        key = '%s#%s'% (spl[1].replace('\\', '/'), spl[4])
+        try:
+            localization_data[key] = spl[10]
+        except:
+            sys.stderr.write('Warning: Ignored line "%s"\n'% line.encode('utf-8'))
+
+    file.close()
+    return True
+
+def unescape(str):
+    unescape_map = {'<': {True:'<', False:'&lt;'},
+                    '>': {True:'>', False:'&gt;'},
+                    '&': {True:'&', False:'&amp;'},
+                    '"': {True:'"', False:'"'}}
+    result = ''
+    escape = False
+    for c in str:
+        if c == '\\':
+            if escape:
+                result = result + '\\'
+                escape = False
+            else:
+                escape = True
+        else:
+            try:
+                replace = unescape_map[c]
+                result = result + replace[escape]
+            except:
+                result = result + c
+            escape = False
+
+    return result
+
+def get_localized_text(filename, id):
+    try:
+        str = localization_data['%s#%s'% (filename, id)]
+    except:
+        return ''
+
+    return unescape(str)
+
+def href_to_fname_id(href):
+    link = href.replace('"', '')
+    fname = link
+    id = ''
+    if link.find("#") >= 0:
+        fname = link[:link.find("#")]
+        id = link[link.find("#")+1:]
+    else:
+        sys.stderr.write('Reference without a "#" in "%s".'% link)
+
+    return [fname, id]
+
+# Base class for all the elements
+#
+# self.name - name of the element, to drop the self.child_parsing flag
+# self.objects - collects the child objects that are constructed during
+#                parsing of the child elements
+# self.child_parsing - flag whether we are parsing a child, or the object
+#                      itself
+# self.parent - parent object
+class ElementBase:
+    def __init__(self, name, parent):
+        self.name = name
+        self.objects = []
+        self.child_parsing = False
+        self.parent = parent
+
+    def start_element(self, parser, name, attrs):
+        pass
+
+    def end_element(self, parser, name):
+        if name == self.name:
+            self.parent.child_parsing = False
+
+    def char_data(self, parser, data):
+        pass
+
+    def get_curobj(self):
+        if self.child_parsing:
+            return self.objects[len(self.objects)-1].get_curobj()
+        return self
+
+    # start parsing a child element
+    def parse_child(self, child):
+        self.child_parsing = True
+        self.objects.append(child)
+
+    # construct the wiki representation of this object, including the objects
+    # held in self.objects (here only the text of the objects)
+    def get_all(self):
+        text = u''
+        for i in self.objects:
+            text = text + i.get_all()
+        return text
+
+    # for handling variables, and embedding in general
+    # id - the variable name we want to get
+    def get_variable(self, id):
+        for i in self.objects:
+            if i != None:
+                var = i.get_variable(id)
+                if var != None:
+                    return var
+        return None
+
+    # embed part of another file into current structure
+    def embed_href(self, parent_parser, fname, id):
+        # parse another xhp
+        parser = XhpParser('source/' + fname, False, \
+                parent_parser.current_app, parent_parser.wiki_page_name, \
+                parent_parser.lang)
+        var = parser.get_variable(id)
+
+        if var != None:
+            try:
+                if var.role == 'variable':
+                    var.role = 'paragraph'
+            except:
+                pass
+            self.objects.append(var)
+        elif parser.follow_embed:
+            sys.stderr.write('Cannot find reference "#%s" in "%s".\n'% \
+                    (id, fname))
+
+    def unhandled_element(self, parser, name):
+        sys.stderr.write('Warning: Unhandled element "%s" in "%s" (%s)\n'% \
+                        (name, self.name, parser.filename))
+
+# Base class for trivial elements that operate on char_data
+#
+# Like <comment>, or <title>
+class TextElementBase(ElementBase):
+    def __init__(self, attrs, parent, element_name, start, end, templ):
+        ElementBase.__init__(self, element_name, parent)
+        self.text = u''
+        self.start = start
+        self.end = end
+        self.templ = templ
+
+    def char_data(self, parser, data):
+        self.text = self.text + data
+
+    def get_all(self):
+        if self.templ:
+            return self.start + escape_equals_sign(replace_text(self.text)) + self.end
+        else:
+            return self.start + replace_text(self.text) + self.end
+
+class XhpFile(ElementBase):
+    def __init__(self):
+        ElementBase.__init__(self, None, None)
+
+    def start_element(self, parser, name, attrs):
+        if name == 'body':
+            # ignored, we flatten the structure
+            pass
+        elif name == 'bookmark':
+            self.parse_child(Bookmark(attrs, self, 'div', parser))
+        elif name == 'comment':
+            self.parse_child(Comment(attrs, self))
+        elif name == 'embed' or name == 'embedvar':
+            if parser.follow_embed:
+                (fname, id) = href_to_fname_id(attrs['href'])
+                self.embed_href(parser, fname, id)
+        elif name == 'helpdocument':
+            # ignored, we flatten the structure
+            pass
+        elif name == 'list':
+            self.parse_child(List(attrs, self))
+        elif name == 'meta':
+            self.parse_child(Meta(attrs, self))
+        elif name == 'paragraph':
+            parser.parse_paragraph(attrs, self)
+        elif name == 'section':
+            self.parse_child(Section(attrs, self))
+        elif name == 'sort':
+            self.parse_child(Sort(attrs, self))
+        elif name == 'switch':
+            self.parse_child(Switch(attrs, self, parser.embedding_app))
+        elif name == 'table':
+            self.parse_child(Table(attrs, self))
+        else:
+            self.unhandled_element(parser, name)
+
+class Bookmark(ElementBase):
+    def __init__(self, attrs, parent, type, parser):
+        ElementBase.__init__(self, 'bookmark', parent)
+
+        self.type = type
+
+        self.id = attrs['id']
+        self.app = ''
+        self.redirect = ''
+        self.target = ''
+        self.authoritative = False
+
+        # let's construct the name of the redirect, so that we can point
+        # to the wikihelp directly from the LO code; wiki then takes care of
+        # the correct redirect
+        branch = attrs['branch']
+        if branch.find('hid/') == 0 and (parser.current_app_raw != '' or parser.follow_embed):
+            name = branch[branch.find('/') + 1:]
+
+            self.app = parser.current_app_raw
+            self.target = parser.wiki_page_name
+            self.authoritative = parser.follow_embed
+            if name.find('.uno:') == 0 or name.find('.HelpId:') == 0:
+                self.redirect = name
+            elif name.upper() in hid_lst:
+                self.redirect = hid_lst[name.upper()]
+            #else:
+            #    sys.stderr.write('Unhandled redirect "%s"\n'% name)
+
+    def get_all(self):
+        global redirects
+        # first of all, we need to create a redirect page for this one
+        if self.redirect != '' and self.target != '':
+            redirects.append([self.app, self.redirect, \
+                '%s#%s'% (self.target, self.id), \
+                self.authoritative])
+
+        # then we also have to setup ID inside the page
+        if self.type == 'div':
+            return '<div id="%s"></div>\n'% self.id
+        elif self.type == 'span':
+            return '<span id="%s"></span>'% self.id
+        else:
+            sys.stderr.write('Unknown bookmark type "%s"'% self.type)
+
+        return ''
+
+class Image(ElementBase):
+    def __init__(self, attrs, parent):
+        ElementBase.__init__(self, 'image', parent)
+        self.src     = attrs['src']
+        try:
+            self.width   = attrs['width']
+            self.height  = attrs['height']
+        except:
+            self.width = self.height = ""
+        self.align   = 'left'
+        self.alt     = False
+        self.alttext = ""
+
+    def start_element(self, parser, name, attrs):
+        if name == 'alt':
+            self.alt = True
+        else:
+            self.unhandled_element(parser, name)
+
+    def end_element(self, parser, name):
+        ElementBase.end_element(self, parser, name)
+
+        if name == 'alt':
+            self.alt = False
+
+    def char_data(self, parser, data):
+        if self.alt:
+            self.alttext = self.alttext + data
+
+    def get_all(self):
+        global images
+        images.add(self.src)
+
+        name = self.src[self.src.rfind('/') + 1:]
+        wikitext = "[[Image:"+name+"|border|"+self.align+"|"
+        if len(self.width):
+            wikitext = wikitext + self.width+"x"+self.height+"|"
+        wikitext = wikitext + self.alttext+"]]"
+        return wikitext
+
+    def get_curobj(self):
+        return self
+
+class Br(TextElementBase):
+    def __init__(self, attrs, parent):
+        TextElementBase.__init__(self, attrs, parent, 'br', '<br/>', '', False)
+
+class Comment(TextElementBase):
+    def __init__(self, attrs, parent):
+        TextElementBase.__init__(self, attrs, parent, 'comment', '<!-- ', ' -->', False)
+
+class HelpIdMissing(TextElementBase):
+    def __init__(self, attrs, parent):
+        TextElementBase.__init__(self, attrs, parent, 'help-id-missing', '{{MissingHelpId}}', '', False)
+
+class Text:
+    def __init__(self, text):
+        self.wikitext = replace_text(text)
+
+    def get_all(self):
+        return self.wikitext
+
+    def get_variable(self, id):
+        return None
+
+class TableCell(ElementBase):
+    def __init__(self, attrs, parent):
+        ElementBase.__init__(self, 'tablecell', parent)
+
+    def start_element(self, parser, name, attrs):
+        if name == 'bookmark':
+            self.parse_child(Bookmark(attrs, self, 'div', parser))
+        elif name == 'comment':
+            self.parse_child(Comment(attrs, self))
+        elif name == 'embed' or name == 'embedvar':
+            (fname, id) = href_to_fname_id(attrs['href'])
+            if parser.follow_embed:
+                self.embed_href(parser, fname, id)
+        elif name == 'paragraph':
+            parser.parse_localized_paragraph(TableContentParagraph(attrs, self), attrs, self)
+        elif name == 'section':
+            self.parse_child(Section(attrs, self))
+        else:
+            self.unhandled_element(parser, name)
+
+class TableRow(ElementBase):
+    def __init__(self, attrs, parent):
+        ElementBase.__init__(self, 'tablerow', parent)
+
+    def start_element(self, parser, name, attrs):
+        if name == 'tablecell':
+            self.parse_child(TableCell(attrs, self))
+        else:
+            self.unhandled_element(parser, name)
+
+    def get_all(self):
+        text = '|-\n' + ElementBase.get_all(self)
+        return text
+
+class Table(ElementBase):
+    def __init__(self, attrs, parent):
+        ElementBase.__init__(self, 'table', parent)
+
+    def start_element(self, parser, name, attrs):
+        if name == 'comment':
+            self.parse_child(Comment(attrs, self))
+        elif name == 'tablerow':
+            self.parse_child(TableRow(attrs, self))
+        else:
+            self.unhandled_element(parser, name)
+
+    def get_all(self):
+        # + ' align="left"' etc.?
+        text = '{| border="1"\n' + \
+            ElementBase.get_all(self) + \
+            '|}\n\n'
+        return text
+
+class ListItem(ElementBase):
+    def __init__(self, attrs, parent):
+        ElementBase.__init__(self, 'listitem', parent)
+
+    def start_element(self, parser, name, attrs):
+        if name == 'bookmark':
+            self.parse_child(Bookmark(attrs, self, 'span', parser))
+        elif name == 'embed' or name == 'embedvar':
+            (fname, id) = href_to_fname_id(attrs['href'])
+            if parser.follow_embed:
+                self.embed_href(parser, fname, id)
+        elif name == 'paragraph':
+            parser.parse_localized_paragraph(ListItemParagraph(attrs, self), attrs, self)
+        else:
+            self.unhandled_element(parser, name)
+
+    def get_all(self):
+        text = '*'
+        postfix = '\n'
+        if self.parent.startwith > 0:
+            text = '<li>'
+            postfix = '</li>'
+        elif self.parent.type == 'ordered':
+            text = '#'
+
+        # add the text itself
+        linebreak = False
+        for i in self.objects:
+            if linebreak:
+                text = text + '<br/>'
+            text = text + i.get_all()
+            linebreak = True
+
+        return text + postfix
+
+class List(ElementBase):
+    def __init__(self, attrs, parent):
+        ElementBase.__init__(self, 'list', parent)
+
+        self.type = attrs['type']
+        try:
+            self.startwith = int(attrs['startwith'])
+        except:
+            self.startwith = 0
+
+    def start_element(self, parser, name, attrs):
+        if name == 'listitem':
+            self.parse_child(ListItem(attrs, self))
+        else:
+            self.unhandled_element(parser, name)
+
+    def get_all(self):
+        text = ""
+        if self.startwith > 0:
+            text = text + '<ol start="%d">\n'% self.startwith
+
+        text = text + ElementBase.get_all(self)
+
+        if self.startwith > 0:
+            text = text + '\n</ol>\n'
+        else:
+            text = text + '\n'
+        return text
+
+# To handle elements that should be completely ignored
+class Ignore(ElementBase):
+    def __init__(self, attrs, parent, element_name):
+        ElementBase.__init__(self, element_name, parent)
+
+class OrigTitle(TextElementBase):
+    def __init__(self, attrs, parent):
+        TextElementBase.__init__(self, attrs, parent, 'title', '{{OrigLang|', '}}\n', True)
+
+class Title(TextElementBase):
+    def __init__(self, attrs, parent, localized_title):
+        TextElementBase.__init__(self, attrs, parent, 'title', '{{Lang|', '}}\n', True)
+        self.localized_title = localized_title
+
+    def get_all(self):
+        if self.localized_title != '':
+            self.text = self.localized_title
+        return TextElementBase.get_all(self)
+
+class Topic(ElementBase):
+    def __init__(self, attrs, parent):
+        ElementBase.__init__(self, 'topic', parent)
+
+    def start_element(self, parser, name, attrs):
+        if name == 'title':
+            if parser.lang == '':
+                self.parse_child(OrigTitle(attrs, self))
+            else:
+                self.parse_child(Title(attrs, self, get_localized_text(parser.filename, 'tit')))
+        elif name == 'filename':
+            self.parse_child(Ignore(attrs, self, name))
+        else:
+            self.unhandled_element(parser, name)
+
+class Meta(ElementBase):
+    def __init__(self, attrs, parent):
+        ElementBase.__init__(self, 'meta', parent)
+
+    def start_element(self, parser, name, attrs):
+        if name == 'topic':
+            self.parse_child(Topic(attrs, self))
+        elif name == 'history' or name == 'lastedited':
+            self.parse_child(Ignore(attrs, self, name))
+        else:
+            self.unhandled_element(parser, name)
+
+class Section(ElementBase):
+    def __init__(self, attrs, parent):
+        ElementBase.__init__(self, 'section', parent)
+        self.id = attrs['id']
+
+    def start_element(self, parser, name, attrs):
+        if name == 'bookmark':
+            self.parse_child(Bookmark(attrs, self, 'div', parser))
+        elif name == 'comment':
+            self.parse_child(Comment(attrs, self))
+        elif name == 'embed' or name == 'embedvar':
+            (fname, id) = href_to_fname_id(attrs['href'])
+            if parser.follow_embed:
+                self.embed_href(parser, fname, id)
+        elif name == 'list':
+            self.parse_child(List(attrs, self))
+        elif name == 'paragraph':
+            parser.parse_paragraph(attrs, self)
+        elif name == 'section':
+            # sections can be nested
+            self.parse_child(Section(attrs, self))
+        elif name == 'switch':
+            self.parse_child(Switch(attrs, self, parser.embedding_app))
+        elif name == 'table':
+            self.parse_child(Table(attrs, self))
+        else:
+            self.unhandled_element(parser, name)
+
+    def get_all(self):
+        mapping = ''
+        try:
+            mapping = section_id_mapping[self.id]
+        except:
+            pass
+
+        # some of the section ids are used as real id's, some of them have
+        # function (like relatetopics), and have to be templatized
+        text = ''
+        if mapping != '':
+            text = '{{%s|%s}}\n\n'% (mapping, \
+                    escape_equals_sign(ElementBase.get_all(self)))
+        else:
+            text = ElementBase.get_all(self)
+
+        return text
+
+    def get_variable(self, id):
+        var = ElementBase.get_variable(self, id)
+        if var != None:
+            return var
+        if id == self.id:
+            return self
+        return None
+
+class Sort(ElementBase):
+    def __init__(self, attrs, parent):
+        ElementBase.__init__(self, 'sort', parent)
+
+        try:
+            self.order = attrs['order']
+        except:
+            self.order = 'asc'
+
+    def start_element(self, parser, name, attrs):
+        if name == 'section':
+            self.parse_child(Section(attrs, self))
+        else:
+            self.unhandled_element(parser, name)
+
+    def get_all(self):
+        rev = False
+        if self.order == 'asc':
+            rev = True
+        self.objects = sorted(self.objects, key=lambda obj: obj.id, reverse=rev)
+
+        return ElementBase.get_all(self)
+
+class Link(ElementBase):
+    def __init__(self, attrs, parent, lang):
+        ElementBase.__init__(self, 'link', parent)
+
+        self.link = attrs['href']
+        try:
+            self.lname = attrs['name']
+        except:
+            self.lname = self.link[self.link.rfind("/")+1:]
+        # Override lname
+        self.default_name = self.lname
+        (self.lname, self.fragment) = get_link_filename(self.link, self.lname)
+        self.wikitext = ""
+        self.lang = lang
+
+    def char_data(self, parser, data):
+        self.wikitext = self.wikitext + data
+
+    def get_all(self):
+        if self.wikitext == "":
+            self.wikitext = self.default_name
+
+        self.wikitext = replace_text(self.wikitext)
+        if self.link.find("http") == 0:
+            text = '[%s %s]'% (self.link, self.wikitext)
+        elif self.lang != '':
+            text = '[[%s/%s%s|%s]]'% (self.lname, self.lang, self.fragment, self.wikitext)
+        else:
+            text = '[[%s%s|%s]]'% (self.lname, self.fragment, self.wikitext)
+        return text
+
+class SwitchInline(ElementBase):
+    def __init__(self, attrs, parent, app):
+        ElementBase.__init__(self, 'switchinline', parent)
+        self.switch = attrs['select']
+        self.embedding_app = app
+
+    def start_element(self, parser, name, attrs):
+        if name == 'caseinline':
+            self.parse_child(CaseInline(attrs, self, False))
+        elif name == 'defaultinline':
+            self.parse_child(CaseInline(attrs, self, True))
+        else:
+            self.unhandled_element(parser, name)
+
+    def get_all(self):
+        if len(self.objects) == 0:
+            return ''
+        elif self.switch == 'sys':
+            system = {'MAC':'', 'UNIX':'', 'WIN':'', 'default':''}
+            for i in self.objects:
+                if i.case == 'MAC' or i.case == 'UNIX' or \
+                   i.case == 'WIN' or i.case == 'default':
+                    system[i.case] = i.get_all()
+                elif i.case == 'OS2':
+                    # ignore, there is only one mention of OS2, which is a
+                    # 'note to translators', and no meat
+                    pass
+                elif i.case == 'HIDE_HERE':
+                    # do what the name suggest ;-)
+                    pass
+                else:
+                    sys.stderr.write('Unhandled "%s" case in "sys" switchinline.\n'% \
+                            i.case )
+            text = '{{System'
+            for i in [['default', 'default'], ['MAC', 'mac'], \
+                      ['UNIX', 'unx'], ['WIN', 'win']]:
+                if system[i[0]] != '':
+                    text = '%s|%s=%s'% (text, i[1], system[i[0]])
+            return text + '}}'
+        elif self.switch == 'appl':
+            # we want directly use the right text, when inlining something
+            # 'shared' into an 'app'
+            if self.embedding_app == '':
+                text = ''
+                default = ''
+                for i in self.objects:
+                    appls = {'BASIC':'Basic', 'CALC':'Calc', \
+                             'CHART':'Chart', 'DRAW':'Draw', \
+                             'IMAGE':'Draw', 'IMPRESS': 'Impress', \
+                             'MATH':'Math', 'WRITER':'Writer', \
+                             'OFFICE':'', 'default':''}
+                    try:
+                        app = appls[i.case]
+                        all = i.get_all()
+                        if all == '':
+                            pass
+                        elif app == '':
+                            default = all
+                        else:
+                            text = text + '{{WhenIn%s|%s}}'% (app, escape_equals_sign(all))
+                    except:
+                        sys.stderr.write('Unhandled "%s" case in "appl" switchinline.\n'% \
+                                i.case)
+
+                if text == '':
+                    text = default
+                elif default != '':
+                    text = text + '{{WhenDefault|%s}}'% escape_equals_sign(default)
+
+                return text
+            else:
+                for i in self.objects:
+                    if i.case == self.embedding_app:
+                        return i.get_all()
+
+        return ''
+
+class Case(ElementBase):
+    def __init__(self, attrs, parent, is_default):
+        ElementBase.__init__(self, 'case', parent)
+
+        if is_default:
+            self.name = 'default'
+            self.case = 'default'
+        else:
+            self.case = attrs['select']
+
+    def start_element(self, parser, name, attrs):
+        if name == 'bookmark':
+            self.parse_child(Bookmark(attrs, self, 'div', parser))
+        elif name == 'comment':
+            self.parse_child(Comment(attrs, self))
+        elif name == 'embed' or name == 'embedvar':
+            if parser.follow_embed:
+                (fname, id) = href_to_fname_id(attrs['href'])
+                self.embed_href(parser, fname, id)
+        elif name == 'list':
+            self.parse_child(List(attrs, self))
+        elif name == 'paragraph':
+            parser.parse_paragraph(attrs, self)
+        elif name == 'section':
+            self.parse_child(Section(attrs, self))
+        elif name == 'table':
+            self.parse_child(Table(attrs, self))
+        else:
+            self.unhandled_element(parser, name)
+
+class Switch(SwitchInline):
+    def __init__(self, attrs, parent, app):
+        SwitchInline.__init__(self, attrs, parent, app)
+        self.name = 'switch'
+
+    def start_element(self, parser, name, attrs):
+        self.embedding_app = parser.embedding_app
+        if name == 'case':
+            self.parse_child(Case(attrs, self, False))
+        elif name == 'default':
+            self.parse_child(Case(attrs, self, True))
+        else:
+            self.unhandled_element(parser, name)
+
+class Item(ElementBase):
+    replace_type = \
+            {'start':{'input': '<code>',
+                      'keycode': '{{KeyCode|',
+                      'tasto': '{{KeyCode|',
+                      'litera': '<code>',
+                      'literal': '<code>',
+                      'menuitem': '{{MenuItem|',
+                      'mwnuitem': '{{MenuItem|',
+                      'OpenOffice.org': '',
+                      'productname': '',
+                      'unknown': '<code>'
+                     },
+             'end':{'input': '</code>',
+                    'keycode': '}}',
+                    'tasto': '}}',
+                    'litera': '</code>',
+                    'literal': '</code>',
+                    'menuitem': '}}',
+                    'mwnuitem': '}}',
+                    'OpenOffice.org': '',
+                    'productname': '',
+                    'unknown': '</code>'
+                   },
+             'templ':{'input': False,
+                      'keycode': True,
+                      'tasto': True,
+                      'litera': False,
+                      'literal': False,
+                      'menuitem': True,
+                      'mwnuitem': True,
+                      'OpenOffice.org': False,
+                      'productname': False,
+                      'unknown': False
+                     }}
+
+    def __init__(self, attrs, parent):
+        ElementBase.__init__(self, 'item', parent)
+
+        try:
+            self.type = attrs['type']
+        except:
+            self.type = 'unknown'
+        self.text = ''
+
+    def char_data(self, parser, data):
+        self.text = self.text + data
+
+    def get_all(self):
+        try:
+            text = ''
+            if self.replace_type['templ'][self.type]:
+                text = escape_equals_sign(replace_text(self.text))
+            else:
+                text = replace_text(self.text)
+            return self.replace_type['start'][self.type] + \
+                   text + \
+                   self.replace_type['end'][self.type]
+        except:
+            sys.stderr.write('Unhandled item type "%s".\n'% self.type)
+
+        return replace_text(self.text)
+
+
+class Paragraph(ElementBase):
+    def __init__(self, attrs, parent):
+        ElementBase.__init__(self, 'paragraph', parent)
+
+        try:
+            self.role = attrs['role']
+        except:
+            self.role = 'paragraph'
+
+        try:
+            self.id = attrs['id']
+        except:
+            self.id = ""
+
+        try:
+            self.level = int(attrs['level'])
+        except:
+            self.level = 0
+
+        self.is_first = (len(self.parent.objects) == 0)
+
+    def start_element(self, parser, name, attrs):
+        if name == 'ahelp':
+            try:
+                if attrs['visibility'] == 'hidden':
+                    self.parse_child(Ignore(attrs, self, name))
+            except:
+                pass
+        elif name == 'br':
+            self.parse_child(Br(attrs, self))
+        elif name == 'comment':
+            self.parse_child(Comment(attrs, self))
+        elif name == 'emph':
+            self.parse_child(Emph(attrs, self))
+        elif name == 'embedvar':
+            if parser.follow_embed:
+                (fname, id) = href_to_fname_id(attrs['href'])
+                self.embed_href(parser, fname, id)
+        elif name == 'help-id-missing':
+            self.parse_child(HelpIdMissing(attrs, self))
+        elif name == 'image':
+            self.parse_child(Image(attrs, self))
+        elif name == 'item':
+            self.parse_child(Item(attrs, self))
+        elif name == 'link':
+            self.parse_child(Link(attrs, self, parser.lang))
+        elif name == 'localized':
+            # we ignore this tag, it is added arbitrary for the paragraphs
+            # that come from .sdf files
+            pass
+        elif name == 'switchinline':
+            self.parse_child(SwitchInline(attrs, self, parser.embedding_app))
+        elif name == 'variable':
+            self.parse_child(Variable(attrs, self))
+        else:
+            self.unhandled_element(parser, name)
+
+    def char_data(self, parser, data):
+        if self.role == 'paragraph' or self.role == 'heading' or \
+                self.role == 'listitem' or self.role == 'variable':
+            if data != '' and data[0] == ' ':
+                data = ' ' + data.lstrip()
+            data = data.replace('\n', ' ')
+
+        if len(data):
+            self.objects.append(Text(data))
+
+    def get_all(self):
+        role = self.role
+        if role == 'heading':
+            if self.level <= 0:
+                sys.stderr.write('Heading, but the level is %d.\n'% self.level)
+            elif self.level < 6:
+                role = 'heading%d'% self.level
+            else:
+                role = 'heading6'
+
+        # if we are not the first para in the table, we need special handling
+        if not self.is_first and role.find('table') == 0:
+            if role == 'tablecontentcode':
+                role = 'tablenextparacode'
+            else:
+                role = 'tablenextpara'
+
+        # the text itself
+        children = ElementBase.get_all(self)
+        if self.role != 'emph':
+            children = children.strip()
+
+        if len(children) == 0:
+            return ''
+
+        # prepend the markup according to the role
+        text = ''
+        try:
+            text = text + replace_paragraph_role['start'][role]
+        except:
+            sys.stderr.write( "Unknown paragraph role start: " + role + "\n" )
+
+        if replace_paragraph_role['templ'][role]:
+            text = text + escape_equals_sign(children)
+        else:
+            text = text + children
+
+        # append the markup according to the role
+        try:
+            text = text + replace_paragraph_role['end'][role]
+        except:
+            sys.stderr.write( "Unknown paragraph role end: " + role + "\n" )
+
+        return text
+
+class Variable(Paragraph):
+    def __init__(self, attrs, parent):
+        Paragraph.__init__(self, attrs, parent)
+        self.name = 'variable'
+        self.role = 'variable'
+        self.id = attrs['id']
+
+    def get_variable(self, id):
+        if id == self.id:
+            return self
+        return None
+
+class CaseInline(Paragraph):
+    def __init__(self, attrs, parent, is_default):
+        Paragraph.__init__(self, attrs, parent)
+
+        self.role = 'null'
+        if is_default:
+            self.name = 'defaultinline'
+            self.case = 'default'
+        else:
+            self.name = 'caseinline'
+            self.case = attrs['select']
+
+class Emph(Paragraph):
+    def __init__(self, attrs, parent):
+        Paragraph.__init__(self, attrs, parent)
+        self.name = 'emph'
+        self.role = 'emph'
+
+    def get_all(self):
+        text = Paragraph.get_all(self)
+        if len(text):
+            return "'''" + text + "'''"
+        return ''
+
+class ListItemParagraph(Paragraph):
+    def __init__(self, attrs, parent):
+        Paragraph.__init__(self, attrs, parent)
+        self.role = 'listitem'
+
+class TableContentParagraph(Paragraph):
+    def __init__(self, attrs, parent):
+        Paragraph.__init__(self, attrs, parent)
+        if self.role != 'tablehead' and self.role != 'tablecontent':
+            if self.role == 'code':
+                self.role = 'tablecontentcode'
+            else:
+                self.role = 'tablecontent'
+
+class ParserBase:
+    def __init__(self, filename, follow_embed, embedding_app, current_app, wiki_page_name, lang, head_object, buffer):
+        self.filename = filename
+        self.follow_embed = follow_embed
+        self.embedding_app = embedding_app
+        self.current_app = current_app
+        self.wiki_page_name = wiki_page_name
+        self.lang = lang
+        self.head_obj = head_object
+
+        p = xml.parsers.expat.ParserCreate()
+        p.StartElementHandler = self.start_element
+        p.EndElementHandler = self.end_element
+        p.CharacterDataHandler = self.char_data
+
+        p.Parse(buffer)
+
+    def start_element(self, name, attrs):
+        self.head_obj.get_curobj().start_element(self, name, attrs)
+
+    def end_element(self, name):
+        self.head_obj.get_curobj().end_element(self, name)
+
+    def char_data(self, data):
+        self.head_obj.get_curobj().char_data(self, data)
+
+    def get_all(self):
+        return self.head_obj.get_all()
+
+    def get_variable(self, id):
+        return self.head_obj.get_variable(id)
+
+    def parse_localized_paragraph(self, paragraph, attrs, obj):
+        localized_text = ''
+        try:
+            localized_text = get_localized_text(self.filename, attrs['id'])
+        except:
+            pass
+
+        if localized_text != '':
+            # parse the localized text
+            text = u'<?xml version="1.0" encoding="UTF-8"?><localized>' + localized_text + '</localized>'
+            ParserBase(self.filename, self.follow_embed, self.embedding_app, \
+                    self.current_app, self.wiki_page_name, self.lang, \
+                    paragraph, text.encode('utf-8'))
+            # add it to the overall structure
+            obj.objects.append(paragraph)
+            # and ignore the original text
+            obj.parse_child(Ignore(attrs, obj, 'paragraph'))
+        else:
+            obj.parse_child(paragraph)
+
+    def parse_paragraph(self, attrs, obj):
+        ignore_this = False
+        try:
+            if attrs['role'] == 'heading' and int(attrs['level']) == 1 \
+                    and self.ignore_heading and self.follow_embed:
+                self.ignore_heading = False
+                ignore_this = True
+        except:
+            pass
+
+        if ignore_this:
+            obj.parse_child(Ignore(attrs, obj, 'paragraph'))
+        else:
+            self.parse_localized_paragraph(Paragraph(attrs, obj), attrs, obj)
+
+class XhpParser(ParserBase):
+    def __init__(self, filename, follow_embed, embedding_app, wiki_page_name, lang):
+        # we want to ignore the 1st level="1" heading, because in most of the
+        # cases, it is the only level="1" heading in the file, and it is the
+        # same as the page title
+        self.ignore_heading = True
+
+        current_app = ''
+        self.current_app_raw = ''
+        for i in [['sbasic', 'BASIC'], ['scalc', 'CALC'], \
+                  ['sdatabase', 'DATABASE'], ['sdraw', 'DRAW'], \
+                  ['schart', 'CHART'], ['simpress', 'IMPRESS'], \
+                  ['smath', 'MATH'], ['swriter', 'WRITER']]:
+            if filename.find('/%s/'% i[0]) >= 0:
+                self.current_app_raw = i[0]
+                current_app = i[1]
+                break
+
+        if embedding_app == '':
+            embedding_app = current_app
+
+        file = codecs.open(filename, "r", "utf-8")
+        buf = file.read()
+        file.close()
+
+        ParserBase.__init__(self, filename, follow_embed, embedding_app,
+                current_app, wiki_page_name, lang, XhpFile(), buf.encode('utf-8'))
+
+def loadallfiles(filename):
+    global titles
+    titles = []
+    file = codecs.open(filename, "r", "utf-8")
+    for line in file:
+        title = line.split(";", 2)
+        titles.append(title)
+    file.close()
+
+class WikiConverter(Thread):
+    def __init__(self, inputfile, wiki_page_name, lang, outputfile):
+        Thread.__init__(self)
+        self.inputfile = inputfile
+        self.wiki_page_name = wiki_page_name
+        self.lang = lang
+        self.outputfile = outputfile
+
+    def run(self):
+        parser = XhpParser(self.inputfile, True, '', self.wiki_page_name, self.lang)
+        file = codecs.open(self.outputfile, "wb", "utf-8")
+        file.write(parser.get_all())
+        file.close()
+
+def write_link(r, target):
+    fname = 'wiki/%s'% r
+    try:
+        file = open(fname, "w")
+        file.write('#REDIRECT [[%s]]\n'% target)
+        file.close()
+    except:
+        sys.stderr.write('Unable to write "%s".\n'%'wiki/%s'% fname)
+
+def write_redirects():
+    print 'Generating the redirects...'
+    written = {}
+    # in the first pass, immediately writte the links that are embedded, so that
+    # we can always point to that source versions
+    for redir in redirects:
+        app = redir[0]
+        redirect = redir[1]
+        target = redir[2]
+        authoritative = redir[3]
+    
+        if app != '':
+            r = '%s/%s'% (app, redirect)
+            if authoritative:
+                write_link(r, target)
+                written[r] = True
+            else:
+                try:
+                    written[r]
+                except:
+                    written[r] = False
+    
+    # in the second pass, output the wiki links
+    for redir in redirects:
+        app = redir[0]
+        redirect = redir[1]
+        target = redir[2]
+    
+        if app == '':
+            for i in ['swriter', 'scalc', 'simpress', 'sdraw', 'smath', \
+                      'schart', 'sbasic', 'sdatabase']:
+                write_link('%s/%s'% (i, redirect), target)
+        else:
+            r = '%s/%s'% (app, redirect)
+            if not written[r]:
+                write_link(r, target)
+
+# Main Function
+def convert(generate_redirects, lang, sdf_file):
+    if lang == '':
+        print 'Generating the main wiki pages...'
+    else:
+        print 'Generating the wiki pages for language %s...'% lang
+
+    global redirects
+    redirects = []
+    global images
+    images = set()
+
+    load_hid_lst()
+    loadallfiles("alltitles.csv")
+
+    if lang != '':
+        sys.stderr.write('Using localizations from "%s"\n'% sdf_file)
+        if not load_localization_data(sdf_file):
+            return
+
+    for title in titles:
+        while threading.active_count() > max_threads:
+            time.sleep(0.001)
+    
+        infile = title[0].strip()
+        wikiname = title[1].strip()
+        articledir = 'wiki/' + wikiname
+        try:
+            os.mkdir(articledir)
+        except:
+            pass
+
+        outfile = ''
+        if lang != '':
+            wikiname = '%s/%s'% (wikiname, lang)
+            outfile = '%s/%s'% (articledir, lang)
+        else:
+            outfile = '%s/MAIN'% articledir
+
+        try:
+            file = open(outfile, 'r')
+        except:
+            try:
+                wiki = WikiConverter(infile, wikiname, lang, outfile)
+                wiki.start()
+                continue
+            except:
+                print 'Failed to convert "%s" into "%s".\n'% \
+                        (infile, outfile)
+        sys.stderr.write('Warning: Skipping: %s > %s\n'% (infile, outfile))
+        file.close()
+    
+    # wait for everyone to finish
+    while threading.active_count() > 1:
+        time.sleep(0.001)
+
+    if lang == '':
+        # set of the images used here
+        print 'Generating "images.txt", the list of used images...'
+        file = open('images.txt', "w")
+        for image in images:
+            file.write('%s\n'% image)
+        file.close()
+
+        # generate the redirects
+        if generate_redirects:
+            write_redirects()
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/helpcontent2/upload-wiki.pl b/helpcontent2/upload-wiki.pl
new file mode 100755
index 0000000000..e5884436fc
--- /dev/null
+++ b/helpcontent2/upload-wiki.pl
@@ -0,0 +1,167 @@
+#!/usr/bin/perl -w
+
+use MediaWiki::API;
+use File::Find();
+use File::Slurp;
+use Getopt::Std;
+
+# help
+sub usage {
+    print <<EOM;
+upload-wiki.pl [...] - Uploads the wiki/ subdir to a real wiki installation.
+
+  -i - Upload also the images
+  -p - Don't upload the pages themselves
+  -r - Upload also the redirects
+
+You need a wikisetup.txt in this directory, to be able to authentificate you.
+The content should be:
+
+wiki=<url of the api.php on the wiki>
+upload=<url of the Special:Upload page>
+name=<the user name>
+password=<the appropriate password>
+
+upload-wiki.pl operates on the output of help-to-wiki.py, needing particularly
+these:
+
+wiki/      - directory with all the pages generated out of the help .xhp files
+images.txt - list of the images used in help
+
+Additionally you need:
+
+images/    - directory with an unpack of images_tango.zip
+
+EOM
+    exit 1;
+}
+
+%options = ();
+getopts( "hipr", \%options );
+
+usage() if ( defined $options{h} );
+
+my $upload_images = 0;
+my $upload_pages = 1;
+my $upload_redirects = 0;
+$upload_images = 1 if ( defined $options{i} );
+$upload_pages = 0 if ( defined $options{p} );
+$upload_redirects = 1 if ( defined $options{r} );
+
+# first of all, read the configuration from wikisetup.txt
+my ( $url, $upload_url, $name, $password );
+if ( ! open( IN, "wikisetup.txt" ) ) {
+    print "Missing wikisetup.txt\n\n";
+    usage();
+}
+while ( my $line = <IN> ) {
+    if ( $line =~ /^([^=]*)=(.*)$/ ) {
+        my $k = $1;
+        my $v = $2;
+        chomp $k;
+        chomp $v;
+        if ( $k eq 'wiki' ) {
+            $url = $v;
+        }
+        elsif ( $k eq 'upload' ) {
+            $upload_url = $v;
+        }
+        elsif ( $k eq 'name' ) {
+            $name = $v;
+        }
+        elsif ( $k eq 'password' ) {
+            $password = $v;
+        }
+    }
+}
+close( IN );
+
+if ( !defined( $url ) || !defined( $upload_url ) || !defined( $name ) || !defined( $password ) ) {
+    print "wikisetup.txt does not contain all the info.\n\n";
+    usage();
+}
+
+if ( ! -d 'wiki' ) {
+    print "Missing the wiki/ subdir, re-run help-to-wiki.py.\n\n";
+    usage();
+}
+
+if ( $upload_images ) {
+    if ( ! -f 'images.txt' ) {
+        print "Missing images.txt, re-run help-to-wiki.py.\n\n";
+        usage();
+    }
+
+    if ( ! -d 'images' ) {
+        print "Missing images/ subdir - mkdir images ; cd images ; unzip /path/to/images_tango.zip\n\n";
+        usage();
+    }
+}
+
+# initialize the wiki
+my $mw = MediaWiki::API->new();
+$mw->{config}->{api_url} = $url;
+$mw->{config}->{upload_url} = $upload_url;
+
+# log in to the wiki
+$mw->login( { lgname => $name, lgpassword => $password } ) || die $mw->{error}->{code} . ': ' . $mw->{error}->{details};
+
+# upload the articles
+sub upload_article {
+    -f || return;
+
+    my $pagename = $File::Find::name;
+    $pagename =~ s/^wiki\///;
+    $pagename =~ s/\/MAIN$//;
+
+    # pages starting with lowercase 's' are redirects
+    if ( $pagename =~ /^s/ ) {
+        return if ( !$upload_redirects );
+    }
+    else {
+        return if ( !$upload_pages );
+    }
+
+    my $text = read_file( $_ );
+
+    print "Uploading page '$pagename'\n";
+    $mw->edit( {
+            action => 'edit',
+            title => $pagename,
+            text => $text }, { skip_encoding => 1 } ) || print 'Error: ' . $mw->{error}->{code} . ': ' . $mw->{error}->{details} . '\n';
+}
+File::Find::find( {wanted => \&upload_article}, 'wiki/' );
+
+# upload the images
+if ( $upload_images ) {
+    open( IN, "images.txt" ) || usage();
+    while ( my $line = <IN> ) {
+        chomp( $line );
+        $fname = "images/$line";
+        if ( ! -f $fname ) {
+            print "Image '$fname' not found, skipped.\n";
+            next;
+        }
+        if ( ! $fname =~ /\.(png|gif|jpg|jpeg)$/ ) {
+            print "Image '$line' ignored, not a jpg/png/gif.\n";
+            next;
+        }
+
+        my $imagename = $line;
+        if ( $line =~ /\/([^\/]*)$/ ) {
+            $imagename = $1;
+        }
+        my $image = read_file( $fname );
+
+        print "Uploading image '$imagename'\n";
+        $mw->upload( {
+                title => $imagename,
+                summary => 'Initial upload.',
+                data => $image } ) || die $mw->{error}->{code} . ': ' . $mw->{error}->{details};
+    }
+}
+
+# clean up
+$mw->logout();
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/helpcontent2/util/sbasic/makefile.mk b/helpcontent2/util/sbasic/makefile.mk
index 8cc7286ac7..51f9898516 100644
--- a/helpcontent2/util/sbasic/makefile.mk
+++ b/helpcontent2/util/sbasic/makefile.mk
@@ -483,7 +483,6 @@ LINKLINKFILES= \
    text$/shared$/01$/04060100.xhp \
    text$/shared$/01$/04060200.xhp \
    text$/shared$/01$/04100000.xhp \
-   text$/shared$/01$/04110000.xhp \
    text$/shared$/01$/04140000.xhp \
    text$/shared$/01$/04150000.xhp \
    text$/shared$/01$/04150100.xhp \
@@ -662,7 +661,6 @@ LINKLINKFILES= \
    text$/shared$/01$/06990000.xhp \
    text$/shared$/01$/07010000.xhp \
    text$/shared$/01$/07080000.xhp \
-   text$/shared$/01$/08060100.xhp \
    text$/shared$/01$/about_meta_tags.xhp \
    text$/shared$/01$/digitalsignatures.xhp \
    text$/shared$/01$/extensionupdate.xhp \
@@ -673,8 +671,6 @@ LINKLINKFILES= \
    text$/shared$/01$/guides.xhp \
    text$/shared$/01$/mediaplayer.xhp \
    text$/shared$/01$/moviesound.xhp \
-   text$/shared$/01$/online_update.xhp \
-   text$/shared$/01$/online_update_dialog.xhp \
    text$/shared$/01$/packagemanager.xhp \
    text$/shared$/01$/password_dlg.xhp \
    text$/shared$/01$/password_main.xhp \
@@ -760,7 +756,6 @@ LINKLINKFILES= \
    text$/shared$/02$/09010000.xhp \
    text$/shared$/02$/09020000.xhp \
    text$/shared$/02$/09030000.xhp \
-   text$/shared$/02$/09050000.xhp \
    text$/shared$/02$/09060000.xhp \
    text$/shared$/02$/09070000.xhp \
    text$/shared$/02$/09070100.xhp \
@@ -926,7 +921,6 @@ LINKLINKFILES= \
    text$/shared$/autopi$/01170400.xhp \
    text$/shared$/autopi$/01170500.xhp \
    text$/shared$/autopi$/purchase.xhp \
-   text$/shared$/autopi$/startup.xhp \
    text$/shared$/autopi$/webwizard00.xhp \
    text$/shared$/autopi$/webwizard01.xhp \
    text$/shared$/autopi$/webwizard02.xhp \
@@ -1094,7 +1088,6 @@ LINKLINKFILES= \
    text$/shared$/guide$/hyperlink_edit.xhp \
    text$/shared$/guide$/hyperlink_insert.xhp \
    text$/shared$/guide$/hyperlink_rel_abs.xhp \
-   text$/shared$/guide$/hyperlink_search.xhp \
    text$/shared$/guide$/imagemap.xhp \
    text$/shared$/guide$/import_ms.xhp \
    text$/shared$/guide$/insert_bitmap.xhp \
@@ -1156,7 +1149,6 @@ LINKLINKFILES= \
    text$/shared$/main0201.xhp \
    text$/shared$/main0204.xhp \
    text$/shared$/main0208.xhp \
-   text$/shared$/main0209.xhp \
    text$/shared$/main0212.xhp \
    text$/shared$/main0213.xhp \
    text$/shared$/main0214.xhp \
@@ -1236,7 +1228,6 @@ LINKLINKFILES= \
    text$/shared$/optionen$/01160100.xhp \
    text$/shared$/optionen$/01160200.xhp \
    text$/shared$/optionen$/01160201.xhp \
-   text$/shared$/optionen$/improvement.xhp \
    text$/shared$/optionen$/java.xhp \
    text$/shared$/optionen$/javaclasspath.xhp \
    text$/shared$/optionen$/javaparameters.xhp \
@@ -1244,7 +1235,6 @@ LINKLINKFILES= \
    text$/shared$/optionen$/macrosecurity_sl.xhp \
    text$/shared$/optionen$/macrosecurity_ts.xhp \
    text$/shared$/optionen$/mailmerge.xhp \
-   text$/shared$/optionen$/online_update.xhp \
    text$/shared$/optionen$/serverauthentication.xhp \
    text$/shared$/optionen$/testaccount.xhp \
    text$/shared$/optionen$/viewcertificate.xhp \
diff --git a/helpcontent2/util/scalc/makefile.mk b/helpcontent2/util/scalc/makefile.mk
index 234bbc7a44..aeaddc4c24 100644
--- a/helpcontent2/util/scalc/makefile.mk
+++ b/helpcontent2/util/scalc/makefile.mk
@@ -496,7 +496,6 @@ LINKLINKFILES= \
    text$/shared$/01$/04060100.xhp \
    text$/shared$/01$/04060200.xhp \
    text$/shared$/01$/04100000.xhp \
-   text$/shared$/01$/04110000.xhp \
    text$/shared$/01$/04140000.xhp \
    text$/shared$/01$/04150000.xhp \
    text$/shared$/01$/04150100.xhp \
@@ -675,7 +674,6 @@ LINKLINKFILES= \
    text$/shared$/01$/06990000.xhp \
    text$/shared$/01$/07010000.xhp \
    text$/shared$/01$/07080000.xhp \
-   text$/shared$/01$/08060100.xhp \
    text$/shared$/01$/about_meta_tags.xhp \
    text$/shared$/01$/digitalsignatures.xhp \
    text$/shared$/01$/extensionupdate.xhp \
@@ -686,8 +684,6 @@ LINKLINKFILES= \
    text$/shared$/01$/guides.xhp \
    text$/shared$/01$/mediaplayer.xhp \
    text$/shared$/01$/moviesound.xhp \
-   text$/shared$/01$/online_update.xhp \
-   text$/shared$/01$/online_update_dialog.xhp \
    text$/shared$/01$/packagemanager.xhp \
    text$/shared$/01$/password_dlg.xhp \
    text$/shared$/01$/password_main.xhp \
@@ -773,7 +769,6 @@ LINKLINKFILES= \
    text$/shared$/02$/09010000.xhp \
    text$/shared$/02$/09020000.xhp \
    text$/shared$/02$/09030000.xhp \
-   text$/shared$/02$/09050000.xhp \
    text$/shared$/02$/09060000.xhp \
    text$/shared$/02$/09070000.xhp \
    text$/shared$/02$/09070100.xhp \
@@ -939,7 +934,6 @@ LINKLINKFILES= \
    text$/shared$/autopi$/01170400.xhp \
    text$/shared$/autopi$/01170500.xhp \
    text$/shared$/autopi$/purchase.xhp \
-   text$/shared$/autopi$/startup.xhp \
    text$/shared$/autopi$/webwizard00.xhp \
    text$/shared$/autopi$/webwizard01.xhp \
    text$/shared$/autopi$/webwizard02.xhp \
@@ -1107,7 +1101,6 @@ LINKLINKFILES= \
    text$/shared$/guide$/hyperlink_edit.xhp \
    text$/shared$/guide$/hyperlink_insert.xhp \
    text$/shared$/guide$/hyperlink_rel_abs.xhp \
-   text$/shared$/guide$/hyperlink_search.xhp \
    text$/shared$/guide$/imagemap.xhp \
    text$/shared$/guide$/import_ms.xhp \
    text$/shared$/guide$/insert_bitmap.xhp \
@@ -1169,7 +1162,6 @@ LINKLINKFILES= \
    text$/shared$/main0201.xhp \
    text$/shared$/main0204.xhp \
    text$/shared$/main0208.xhp \
-   text$/shared$/main0209.xhp \
    text$/shared$/main0212.xhp \
    text$/shared$/main0213.xhp \
    text$/shared$/main0214.xhp \
@@ -1249,7 +1241,6 @@ LINKLINKFILES= \
    text$/shared$/optionen$/01160100.xhp \
    text$/shared$/optionen$/01160200.xhp \
    text$/shared$/optionen$/01160201.xhp \
-   text$/shared$/optionen$/improvement.xhp \
    text$/shared$/optionen$/java.xhp \
    text$/shared$/optionen$/javaclasspath.xhp \
    text$/shared$/optionen$/javaparameters.xhp \
@@ -1257,7 +1248,6 @@ LINKLINKFILES= \
    text$/shared$/optionen$/macrosecurity_sl.xhp \
    text$/shared$/optionen$/macrosecurity_ts.xhp \
    text$/shared$/optionen$/mailmerge.xhp \
-   text$/shared$/optionen$/online_update.xhp \
    text$/shared$/optionen$/serverauthentication.xhp \
    text$/shared$/optionen$/testaccount.xhp \
    text$/shared$/optionen$/viewcertificate.xhp \
diff --git a/helpcontent2/util/schart/makefile.mk b/helpcontent2/util/schart/makefile.mk
index 25805c51c4..955d107095 100644
--- a/helpcontent2/util/schart/makefile.mk
+++ b/helpcontent2/util/schart/makefile.mk
@@ -184,7 +184,6 @@ LINKLINKFILES= \
    text$/shared$/01$/04060100.xhp \
    text$/shared$/01$/04060200.xhp \
    text$/shared$/01$/04100000.xhp \
-   text$/shared$/01$/04110000.xhp \
    text$/shared$/01$/04140000.xhp \
    text$/shared$/01$/04150000.xhp \
    text$/shared$/01$/04150100.xhp \
@@ -363,7 +362,6 @@ LINKLINKFILES= \
    text$/shared$/01$/06990000.xhp \
    text$/shared$/01$/07010000.xhp \
    text$/shared$/01$/07080000.xhp \
-   text$/shared$/01$/08060100.xhp \
    text$/shared$/01$/about_meta_tags.xhp \
    text$/shared$/01$/digitalsignatures.xhp \
    text$/shared$/01$/extensionupdate.xhp \
@@ -374,8 +372,6 @@ LINKLINKFILES= \
    text$/shared$/01$/guides.xhp \
    text$/shared$/01$/mediaplayer.xhp \
    text$/shared$/01$/moviesound.xhp \
-   text$/shared$/01$/online_update.xhp \
-   text$/shared$/01$/online_update_dialog.xhp \
    text$/shared$/01$/packagemanager.xhp \
    text$/shared$/01$/password_dlg.xhp \
    text$/shared$/01$/password_main.xhp \
@@ -461,7 +457,6 @@ LINKLINKFILES= \
    text$/shared$/02$/09010000.xhp \
    text$/shared$/02$/09020000.xhp \
    text$/shared$/02$/09030000.xhp \
-   text$/shared$/02$/09050000.xhp \
    text$/shared$/02$/09060000.xhp \
    text$/shared$/02$/09070000.xhp \
    text$/shared$/02$/09070100.xhp \
@@ -627,7 +622,6 @@ LINKLINKFILES= \
    text$/shared$/autopi$/01170400.xhp \
    text$/shared$/autopi$/01170500.xhp \
    text$/shared$/autopi$/purchase.xhp \
-   text$/shared$/autopi$/startup.xhp \
    text$/shared$/autopi$/webwizard00.xhp \
    text$/shared$/autopi$/webwizard01.xhp \
    text$/shared$/autopi$/webwizard02.xhp \
@@ -795,7 +789,6 @@ LINKLINKFILES= \
    text$/shared$/guide$/hyperlink_edit.xhp \
    text$/shared$/guide$/hyperlink_insert.xhp \
    text$/shared$/guide$/hyperlink_rel_abs.xhp \
-   text$/shared$/guide$/hyperlink_search.xhp \
    text$/shared$/guide$/imagemap.xhp \
    text$/shared$/guide$/import_ms.xhp \
    text$/shared$/guide$/insert_bitmap.xhp \
@@ -857,7 +850,6 @@ LINKLINKFILES= \
    text$/shared$/main0201.xhp \
    text$/shared$/main0204.xhp \
    text$/shared$/main0208.xhp \
-   text$/shared$/main0209.xhp \
    text$/shared$/main0212.xhp \
    text$/shared$/main0213.xhp \
    text$/shared$/main0214.xhp \
@@ -937,7 +929,6 @@ LINKLINKFILES= \
    text$/shared$/optionen$/01160100.xhp \
    text$/shared$/optionen$/01160200.xhp \
    text$/shared$/optionen$/01160201.xhp \
-   text$/shared$/optionen$/improvement.xhp \
    text$/shared$/optionen$/java.xhp \
    text$/shared$/optionen$/javaclasspath.xhp \
    text$/shared$/optionen$/javaparameters.xhp \
@@ -945,7 +936,6 @@ LINKLINKFILES= \
    text$/shared$/optionen$/macrosecurity_sl.xhp \
    text$/shared$/optionen$/macrosecurity_ts.xhp \
    text$/shared$/optionen$/mailmerge.xhp \
-   text$/shared$/optionen$/online_update.xhp \
    text$/shared$/optionen$/serverauthentication.xhp \
    text$/shared$/optionen$/testaccount.xhp \
    text$/shared$/optionen$/viewcertificate.xhp \
diff --git a/helpcontent2/util/sdatabase/makefile.mk b/helpcontent2/util/sdatabase/makefile.mk
index cce9a418ad..f42fc5bd75 100644
--- a/helpcontent2/util/sdatabase/makefile.mk
+++ b/helpcontent2/util/sdatabase/makefile.mk
@@ -182,7 +182,6 @@ LINKLINKFILES= \
    text$/shared$/01$/04060100.xhp \
    text$/shared$/01$/04060200.xhp \
    text$/shared$/01$/04100000.xhp \
-   text$/shared$/01$/04110000.xhp \
    text$/shared$/01$/04140000.xhp \
    text$/shared$/01$/04150000.xhp \
    text$/shared$/01$/04150100.xhp \
@@ -361,7 +360,6 @@ LINKLINKFILES= \
    text$/shared$/01$/06990000.xhp \
    text$/shared$/01$/07010000.xhp \
    text$/shared$/01$/07080000.xhp \
-   text$/shared$/01$/08060100.xhp \
    text$/shared$/01$/about_meta_tags.xhp \
    text$/shared$/01$/digitalsignatures.xhp \
    text$/shared$/01$/extensionupdate.xhp \
@@ -372,8 +370,6 @@ LINKLINKFILES= \
    text$/shared$/01$/guides.xhp \
    text$/shared$/01$/mediaplayer.xhp \
    text$/shared$/01$/moviesound.xhp \
-   text$/shared$/01$/online_update.xhp \
-   text$/shared$/01$/online_update_dialog.xhp \
    text$/shared$/01$/packagemanager.xhp \
    text$/shared$/01$/password_dlg.xhp \
    text$/shared$/01$/password_main.xhp \
@@ -459,7 +455,6 @@ LINKLINKFILES= \
    text$/shared$/02$/09010000.xhp \
    text$/shared$/02$/09020000.xhp \
    text$/shared$/02$/09030000.xhp \
-   text$/shared$/02$/09050000.xhp \
    text$/shared$/02$/09060000.xhp \
    text$/shared$/02$/09070000.xhp \
    text$/shared$/02$/09070100.xhp \
@@ -625,7 +620,6 @@ LINKLINKFILES= \
    text$/shared$/autopi$/01170400.xhp \
    text$/shared$/autopi$/01170500.xhp \
    text$/shared$/autopi$/purchase.xhp \
-   text$/shared$/autopi$/startup.xhp \
    text$/shared$/autopi$/webwizard00.xhp \
    text$/shared$/autopi$/webwizard01.xhp \
    text$/shared$/autopi$/webwizard02.xhp \
@@ -793,7 +787,6 @@ LINKLINKFILES= \
    text$/shared$/guide$/hyperlink_edit.xhp \
    text$/shared$/guide$/hyperlink_insert.xhp \
    text$/shared$/guide$/hyperlink_rel_abs.xhp \
-   text$/shared$/guide$/hyperlink_search.xhp \
    text$/shared$/guide$/imagemap.xhp \
    text$/shared$/guide$/import_ms.xhp \
    text$/shared$/guide$/insert_bitmap.xhp \
@@ -855,7 +848,6 @@ LINKLINKFILES= \
    text$/shared$/main0201.xhp \
    text$/shared$/main0204.xhp \
    text$/shared$/main0208.xhp \
-   text$/shared$/main0209.xhp \
    text$/shared$/main0212.xhp \
    text$/shared$/main0213.xhp \
    text$/shared$/main0214.xhp \
@@ -935,7 +927,6 @@ LINKLINKFILES= \
    text$/shared$/optionen$/01160100.xhp \
    text$/shared$/optionen$/01160200.xhp \
    text$/shared$/optionen$/01160201.xhp \
-   text$/shared$/optionen$/improvement.xhp \
    text$/shared$/optionen$/java.xhp \
    text$/shared$/optionen$/javaclasspath.xhp \
    text$/shared$/optionen$/javaparameters.xhp \
@@ -943,7 +934,6 @@ LINKLINKFILES= \
    text$/shared$/optionen$/macrosecurity_sl.xhp \
    text$/shared$/optionen$/macrosecurity_ts.xhp \
    text$/shared$/optionen$/mailmerge.xhp \
-   text$/shared$/optionen$/online_update.xhp \
    text$/shared$/optionen$/serverauthentication.xhp \
    text$/shared$/optionen$/testaccount.xhp \
    text$/shared$/optionen$/viewcertificate.xhp \
diff --git a/helpcontent2/util/sdraw/makefile.mk b/helpcontent2/util/sdraw/makefile.mk
index 9c38a6810b..75541ffa2d 100644
--- a/helpcontent2/util/sdraw/makefile.mk
+++ b/helpcontent2/util/sdraw/makefile.mk
@@ -417,7 +417,6 @@ LINKLINKFILES= \
    text$/shared$/01$/04060100.xhp \
    text$/shared$/01$/04060200.xhp \
    text$/shared$/01$/04100000.xhp \
-   text$/shared$/01$/04110000.xhp \
    text$/shared$/01$/04140000.xhp \
    text$/shared$/01$/04150000.xhp \
    text$/shared$/01$/04150100.xhp \
@@ -596,7 +595,6 @@ LINKLINKFILES= \
    text$/shared$/01$/06990000.xhp \
    text$/shared$/01$/07010000.xhp \
    text$/shared$/01$/07080000.xhp \
-   text$/shared$/01$/08060100.xhp \
    text$/shared$/01$/about_meta_tags.xhp \
    text$/shared$/01$/digitalsignatures.xhp \
    text$/shared$/01$/extensionupdate.xhp \
@@ -607,8 +605,6 @@ LINKLINKFILES= \
    text$/shared$/01$/guides.xhp \
    text$/shared$/01$/mediaplayer.xhp \
    text$/shared$/01$/moviesound.xhp \
-   text$/shared$/01$/online_update.xhp \
-   text$/shared$/01$/online_update_dialog.xhp \
    text$/shared$/01$/packagemanager.xhp \
    text$/shared$/01$/password_dlg.xhp \
    text$/shared$/01$/password_main.xhp \
@@ -694,7 +690,6 @@ LINKLINKFILES= \
    text$/shared$/02$/09010000.xhp \
    text$/shared$/02$/09020000.xhp \
    text$/shared$/02$/09030000.xhp \
-   text$/shared$/02$/09050000.xhp \
    text$/shared$/02$/09060000.xhp \
    text$/shared$/02$/09070000.xhp \
    text$/shared$/02$/09070100.xhp \
@@ -860,7 +855,6 @@ LINKLINKFILES= \
    text$/shared$/autopi$/01170400.xhp \
    text$/shared$/autopi$/01170500.xhp \
    text$/shared$/autopi$/purchase.xhp \
-   text$/shared$/autopi$/startup.xhp \
    text$/shared$/autopi$/webwizard00.xhp \
    text$/shared$/autopi$/webwizard01.xhp \
    text$/shared$/autopi$/webwizard02.xhp \
@@ -1028,7 +1022,6 @@ LINKLINKFILES= \
    text$/shared$/guide$/hyperlink_edit.xhp \
    text$/shared$/guide$/hyperlink_insert.xhp \
    text$/shared$/guide$/hyperlink_rel_abs.xhp \
-   text$/shared$/guide$/hyperlink_search.xhp \
    text$/shared$/guide$/imagemap.xhp \
    text$/shared$/guide$/import_ms.xhp \
    text$/shared$/guide$/insert_bitmap.xhp \
@@ -1090,7 +1083,6 @@ LINKLINKFILES= \
    text$/shared$/main0201.xhp \
    text$/shared$/main0204.xhp \
    text$/shared$/main0208.xhp \
-   text$/shared$/main0209.xhp \
    text$/shared$/main0212.xhp \
    text$/shared$/main0213.xhp \
    text$/shared$/main0214.xhp \
@@ -1170,7 +1162,6 @@ LINKLINKFILES= \
    text$/shared$/optionen$/01160100.xhp \
    text$/shared$/optionen$/01160200.xhp \
    text$/shared$/optionen$/01160201.xhp \
-   text$/shared$/optionen$/improvement.xhp \
    text$/shared$/optionen$/java.xhp \
    text$/shared$/optionen$/javaclasspath.xhp \
    text$/shared$/optionen$/javaparameters.xhp \
@@ -1178,7 +1169,6 @@ LINKLINKFILES= \
    text$/shared$/optionen$/macrosecurity_sl.xhp \
    text$/shared$/optionen$/macrosecurity_ts.xhp \
    text$/shared$/optionen$/mailmerge.xhp \
-   text$/shared$/optionen$/online_update.xhp \
    text$/shared$/optionen$/serverauthentication.xhp \
    text$/shared$/optionen$/testaccount.xhp \
    text$/shared$/optionen$/viewcertificate.xhp \
diff --git a/helpcontent2/util/simpress/makefile.mk b/helpcontent2/util/simpress/makefile.mk
index 864768854b..16aea33e47 100644
--- a/helpcontent2/util/simpress/makefile.mk
+++ b/helpcontent2/util/simpress/makefile.mk
@@ -419,7 +419,6 @@ LINKLINKFILES= \
    text$/shared$/01$/04060100.xhp \
    text$/shared$/01$/04060200.xhp \
    text$/shared$/01$/04100000.xhp \
-   text$/shared$/01$/04110000.xhp \
    text$/shared$/01$/04140000.xhp \
    text$/shared$/01$/04150000.xhp \
    text$/shared$/01$/04150100.xhp \
@@ -598,7 +597,6 @@ LINKLINKFILES= \
    text$/shared$/01$/06990000.xhp \
    text$/shared$/01$/07010000.xhp \
    text$/shared$/01$/07080000.xhp \
-   text$/shared$/01$/08060100.xhp \
    text$/shared$/01$/about_meta_tags.xhp \
    text$/shared$/01$/digitalsignatures.xhp \
    text$/shared$/01$/extensionupdate.xhp \
@@ -609,8 +607,6 @@ LINKLINKFILES= \
    text$/shared$/01$/guides.xhp \
    text$/shared$/01$/mediaplayer.xhp \
    text$/shared$/01$/moviesound.xhp \
-   text$/shared$/01$/online_update.xhp \
-   text$/shared$/01$/online_update_dialog.xhp \
    text$/shared$/01$/packagemanager.xhp \
    text$/shared$/01$/password_dlg.xhp \
    text$/shared$/01$/password_main.xhp \
@@ -696,7 +692,6 @@ LINKLINKFILES= \
    text$/shared$/02$/09010000.xhp \
    text$/shared$/02$/09020000.xhp \
    text$/shared$/02$/09030000.xhp \
-   text$/shared$/02$/09050000.xhp \
    text$/shared$/02$/09060000.xhp \
    text$/shared$/02$/09070000.xhp \
    text$/shared$/02$/09070100.xhp \
@@ -862,7 +857,6 @@ LINKLINKFILES= \
    text$/shared$/autopi$/01170400.xhp \
    text$/shared$/autopi$/01170500.xhp \
    text$/shared$/autopi$/purchase.xhp \
-   text$/shared$/autopi$/startup.xhp \
    text$/shared$/autopi$/webwizard00.xhp \
    text$/shared$/autopi$/webwizard01.xhp \
    text$/shared$/autopi$/webwizard02.xhp \
@@ -1030,7 +1024,6 @@ LINKLINKFILES= \
    text$/shared$/guide$/hyperlink_edit.xhp \
    text$/shared$/guide$/hyperlink_insert.xhp \
    text$/shared$/guide$/hyperlink_rel_abs.xhp \
-   text$/shared$/guide$/hyperlink_search.xhp \
    text$/shared$/guide$/imagemap.xhp \
    text$/shared$/guide$/import_ms.xhp \
    text$/shared$/guide$/insert_bitmap.xhp \
@@ -1092,7 +1085,6 @@ LINKLINKFILES= \
    text$/shared$/main0201.xhp \
    text$/shared$/main0204.xhp \
    text$/shared$/main0208.xhp \
-   text$/shared$/main0209.xhp \
    text$/shared$/main0212.xhp \
    text$/shared$/main0213.xhp \
    text$/shared$/main0214.xhp \
@@ -1172,7 +1164,6 @@ LINKLINKFILES= \
    text$/shared$/optionen$/01160100.xhp \
    text$/shared$/optionen$/01160200.xhp \
    text$/shared$/optionen$/01160201.xhp \
-   text$/shared$/optionen$/improvement.xhp \
    text$/shared$/optionen$/java.xhp \
    text$/shared$/optionen$/javaclasspath.xhp \
    text$/shared$/optionen$/javaparameters.xhp \
@@ -1180,7 +1171,6 @@ LINKLINKFILES= \
    text$/shared$/optionen$/macrosecurity_sl.xhp \
    text$/shared$/optionen$/macrosecurity_ts.xhp \
    text$/shared$/optionen$/mailmerge.xhp \
-   text$/shared$/optionen$/online_update.xhp \
    text$/shared$/optionen$/serverauthentication.xhp \
    text$/shared$/optionen$/testaccount.xhp \
    text$/shared$/optionen$/viewcertificate.xhp \
diff --git a/helpcontent2/util/smath/makefile.mk b/helpcontent2/util/smath/makefile.mk
index 3199c0ec41..3059b11159 100644
--- a/helpcontent2/util/smath/makefile.mk
+++ b/helpcontent2/util/smath/makefile.mk
@@ -262,7 +262,6 @@ LINKLINKFILES= \
    text$/shared$/01$/04060100.xhp \
    text$/shared$/01$/04060200.xhp \
    text$/shared$/01$/04100000.xhp \
-   text$/shared$/01$/04110000.xhp \
    text$/shared$/01$/04140000.xhp \
    text$/shared$/01$/04150000.xhp \
    text$/shared$/01$/04150100.xhp \
@@ -441,7 +440,6 @@ LINKLINKFILES= \
    text$/shared$/01$/06990000.xhp \
    text$/shared$/01$/07010000.xhp \
    text$/shared$/01$/07080000.xhp \
-   text$/shared$/01$/08060100.xhp \
    text$/shared$/01$/about_meta_tags.xhp \
    text$/shared$/01$/digitalsignatures.xhp \
    text$/shared$/01$/extensionupdate.xhp \
@@ -452,8 +450,6 @@ LINKLINKFILES= \
    text$/shared$/01$/guides.xhp \
    text$/shared$/01$/mediaplayer.xhp \
    text$/shared$/01$/moviesound.xhp \
-   text$/shared$/01$/online_update.xhp \
-   text$/shared$/01$/online_update_dialog.xhp \
    text$/shared$/01$/packagemanager.xhp \
    text$/shared$/01$/password_dlg.xhp \
    text$/shared$/01$/password_main.xhp \
@@ -539,7 +535,6 @@ LINKLINKFILES= \
    text$/shared$/02$/09010000.xhp \
    text$/shared$/02$/09020000.xhp \
    text$/shared$/02$/09030000.xhp \
-   text$/shared$/02$/09050000.xhp \
    text$/shared$/02$/09060000.xhp \
    text$/shared$/02$/09070000.xhp \
    text$/shared$/02$/09070100.xhp \
@@ -705,7 +700,6 @@ LINKLINKFILES= \
    text$/shared$/autopi$/01170400.xhp \
    text$/shared$/autopi$/01170500.xhp \
    text$/shared$/autopi$/purchase.xhp \
-   text$/shared$/autopi$/startup.xhp \
    text$/shared$/autopi$/webwizard00.xhp \
    text$/shared$/autopi$/webwizard01.xhp \
    text$/shared$/autopi$/webwizard02.xhp \
@@ -873,7 +867,6 @@ LINKLINKFILES= \
    text$/shared$/guide$/hyperlink_edit.xhp \
    text$/shared$/guide$/hyperlink_insert.xhp \
    text$/shared$/guide$/hyperlink_rel_abs.xhp \
-   text$/shared$/guide$/hyperlink_search.xhp \
    text$/shared$/guide$/imagemap.xhp \
    text$/shared$/guide$/import_ms.xhp \
    text$/shared$/guide$/insert_bitmap.xhp \
@@ -935,7 +928,6 @@ LINKLINKFILES= \
    text$/shared$/main0201.xhp \
    text$/shared$/main0204.xhp \
    text$/shared$/main0208.xhp \
-   text$/shared$/main0209.xhp \
    text$/shared$/main0212.xhp \
    text$/shared$/main0213.xhp \
    text$/shared$/main0214.xhp \
@@ -1015,7 +1007,6 @@ LINKLINKFILES= \
    text$/shared$/optionen$/01160100.xhp \
    text$/shared$/optionen$/01160200.xhp \
    text$/shared$/optionen$/01160201.xhp \
-   text$/shared$/optionen$/improvement.xhp \
    text$/shared$/optionen$/java.xhp \
    text$/shared$/optionen$/javaclasspath.xhp \
    text$/shared$/optionen$/javaparameters.xhp \
@@ -1023,7 +1014,6 @@ LINKLINKFILES= \
    text$/shared$/optionen$/macrosecurity_sl.xhp \
    text$/shared$/optionen$/macrosecurity_ts.xhp \
    text$/shared$/optionen$/mailmerge.xhp \
-   text$/shared$/optionen$/online_update.xhp \
    text$/shared$/optionen$/serverauthentication.xhp \
    text$/shared$/optionen$/testaccount.xhp \
    text$/shared$/optionen$/viewcertificate.xhp \
diff --git a/helpcontent2/util/swriter/makefile.mk b/helpcontent2/util/swriter/makefile.mk
index 56f99bdaae..1ed17d2bbb 100644
--- a/helpcontent2/util/swriter/makefile.mk
+++ b/helpcontent2/util/swriter/makefile.mk
@@ -574,7 +574,6 @@ LINKLINKFILES= \
    text$/shared$/01$/04060100.xhp \
    text$/shared$/01$/04060200.xhp \
    text$/shared$/01$/04100000.xhp \
-   text$/shared$/01$/04110000.xhp \
    text$/shared$/01$/04140000.xhp \
    text$/shared$/01$/04150000.xhp \
    text$/shared$/01$/04150100.xhp \
@@ -753,7 +752,6 @@ LINKLINKFILES= \
    text$/shared$/01$/06990000.xhp \
    text$/shared$/01$/07010000.xhp \
    text$/shared$/01$/07080000.xhp \
-   text$/shared$/01$/08060100.xhp \
    text$/shared$/01$/about_meta_tags.xhp \
    text$/shared$/01$/digitalsignatures.xhp \
    text$/shared$/01$/extensionupdate.xhp \
@@ -764,8 +762,6 @@ LINKLINKFILES= \
    text$/shared$/01$/guides.xhp \
    text$/shared$/01$/mediaplayer.xhp \
    text$/shared$/01$/moviesound.xhp \
-   text$/shared$/01$/online_update.xhp \
-   text$/shared$/01$/online_update_dialog.xhp \
    text$/shared$/01$/packagemanager.xhp \
    text$/shared$/01$/password_dlg.xhp \
    text$/shared$/01$/password_main.xhp \
@@ -851,7 +847,6 @@ LINKLINKFILES= \
    text$/shared$/02$/09010000.xhp \
    text$/shared$/02$/09020000.xhp \
    text$/shared$/02$/09030000.xhp \
-   text$/shared$/02$/09050000.xhp \
    text$/shared$/02$/09060000.xhp \
    text$/shared$/02$/09070000.xhp \
    text$/shared$/02$/09070100.xhp \
@@ -1017,7 +1012,6 @@ LINKLINKFILES= \
    text$/shared$/autopi$/01170400.xhp \
    text$/shared$/autopi$/01170500.xhp \
    text$/shared$/autopi$/purchase.xhp \
-   text$/shared$/autopi$/startup.xhp \
    text$/shared$/autopi$/webwizard00.xhp \
    text$/shared$/autopi$/webwizard01.xhp \
    text$/shared$/autopi$/webwizard02.xhp \
@@ -1185,7 +1179,6 @@ LINKLINKFILES= \
    text$/shared$/guide$/hyperlink_edit.xhp \
    text$/shared$/guide$/hyperlink_insert.xhp \
    text$/shared$/guide$/hyperlink_rel_abs.xhp \
-   text$/shared$/guide$/hyperlink_search.xhp \
    text$/shared$/guide$/imagemap.xhp \
    text$/shared$/guide$/import_ms.xhp \
    text$/shared$/guide$/insert_bitmap.xhp \
@@ -1247,7 +1240,6 @@ LINKLINKFILES= \
    text$/shared$/main0201.xhp \
    text$/shared$/main0204.xhp \
    text$/shared$/main0208.xhp \
-   text$/shared$/main0209.xhp \
    text$/shared$/main0212.xhp \
    text$/shared$/main0213.xhp \
    text$/shared$/main0214.xhp \
@@ -1327,7 +1319,6 @@ LINKLINKFILES= \
    text$/shared$/optionen$/01160100.xhp \
    text$/shared$/optionen$/01160200.xhp \
    text$/shared$/optionen$/01160201.xhp \
-   text$/shared$/optionen$/improvement.xhp \
    text$/shared$/optionen$/java.xhp \
    text$/shared$/optionen$/javaclasspath.xhp \
    text$/shared$/optionen$/javaparameters.xhp \
@@ -1335,7 +1326,6 @@ LINKLINKFILES= \
    text$/shared$/optionen$/macrosecurity_sl.xhp \
    text$/shared$/optionen$/macrosecurity_ts.xhp \
    text$/shared$/optionen$/mailmerge.xhp \
-   text$/shared$/optionen$/online_update.xhp \
    text$/shared$/optionen$/serverauthentication.xhp \
    text$/shared$/optionen$/testaccount.xhp \
    text$/shared$/optionen$/viewcertificate.xhp \
diff --git a/helpcontent2/util/target.pmk b/helpcontent2/util/target.pmk
index 48135b9a30..40f6e5d91c 100755
--- a/helpcontent2/util/target.pmk
+++ b/helpcontent2/util/target.pmk
@@ -36,7 +36,7 @@ JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
 
 XSL_DIR*:=$(SOLARBINDIR)
 
-$(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag 
+$(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag
     $(HELPLINKER) @$(mktmp -mod $(LINKNAME) -src $(COMMONMISC) -sty $(XSL_DIR)/embed.xsl -zipdir $(MISC)$/ziptmp$(@:b) -idxcaption $(XSL_DIR)/idxcaption.xsl -idxcontent $(XSL_DIR)/idxcontent.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@.$(INPATH))
 .IF "$(SOLAR_JAVA)" == "TRUE"
 .IF "$(CHECK_LUCENCE_INDEXER_OUTPUT)" == ""