--- ./xmlhelp/source/cxxhelp/provider/databases.cxx.orig3	2011-12-05 15:11:11.000000000 +0000
+++ ./xmlhelp/source/cxxhelp/provider/databases.cxx	2011-12-05 16:15:02.000000000 +0000
@@ -303,17 +303,34 @@ rtl::OString Databases::getImagesZipFile
             bool bFound = false;
             if ( aSymbolsStyleName.getLength() != 0 )
             {
-                rtl::OUString aZipName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images_" ));
-                aZipName += aSymbolsStyleName;
-                aZipName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".zip" ));
-
+                rtl::OUString aZipName;
+                if (aSymbolsStyleName.equals( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("default")) )) {
+                    aZipName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images.zip" ));
+                } else  {
+                    aZipName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images_" ));
+                    aZipName += aSymbolsStyleName;
+                    aZipName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".zip" ));
+                }
                 bFound = impl_getZipFile( m_aImagesZipPaths, aZipName, aImageZip );
             }
 
+            // Fallbacks in case the configured style fle was not found
+            if ( ! bFound )
+                bFound = impl_getZipFile( m_aImagesZipPaths, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images_oxygen.zip" )), aImageZip );
+
+            if ( ! bFound )
+                bFound = impl_getZipFile( m_aImagesZipPaths, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images_crystal.zip" )), aImageZip );
+
             if ( ! bFound )
                 bFound = impl_getZipFile( m_aImagesZipPaths, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images.zip" )), aImageZip );
 
             if ( ! bFound )
+                bFound = impl_getZipFile( m_aImagesZipPaths, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images_tango.zip" )), aImageZip );
+
+            if ( ! bFound )
+                bFound = impl_getZipFile( m_aImagesZipPaths, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images_hicontrast.zip" )), aImageZip );
+
+            if ( ! bFound )
                 aImageZip = rtl::OUString();
 
             m_aImagesZipFileURL = rtl::OUStringToOString(