diff --git a/local/config/vufind/DAIA.ini b/local/config/vufind/DAIA.ini
index b2f2ab16c944d82164d62a3a8ebd237e63d7691c..b276c35d4d36a63bbe5fc42591f0462f144c79dd 100644
--- a/local/config/vufind/DAIA.ini
+++ b/local/config/vufind/DAIA.ini
@@ -35,13 +35,13 @@
 ; If daiaContentTypes are set, the DAIA driver checks the Content-Type
 ; line in the DAIA response HTTP header for the configured values. If
 ; daiaContentTypes is not set, Content-Type HTTP header is NOT checked.
-; 
+;
 ; expected Content-Types for DAIA XML format:
-; (seperate multiple values by commata, for example:
+; (separate multiple values by commas, for example:
 ; daiaContentTypes['xml'] = "application/xml, text/xml"
 daiaContentTypes['xml'] = "application/xml"
 
 ; expected Content-Types for DAIA JSON format:
-; (seperate multiple values by commata, for example:
-; daiaContentTypes['xml'] = "application/json, application/javascript"
-daiaContentTypes['json'] = "application/json"
+; (separate multiple values by commas, for example:
+; daiaContentTypes['json'] = "application/json, application/javascript"
+daiaContentTypes['json'] = "application/json"
\ No newline at end of file
diff --git a/local/config/vufind/config.ini b/local/config/vufind/config.ini
index 67f8153e75acde0f31b6eab45bd44309b53d64d6..8bdc524bd0d45cfaa8fb8ae6c6568ada377b2f39 100644
--- a/local/config/vufind/config.ini
+++ b/local/config/vufind/config.ini
@@ -13,6 +13,10 @@ available       = true
 debug           = false
 ; This setting should be set to false after auto-configuration is complete
 autoConfigure = true
+; This setting specifies a health check file location. If a health check file exists,
+; the getServerStatus AJAX call will return an error regardless of actual status
+; allowing the server to be disabled from a load-balancer.
+;healthCheckFile = /tmp/disable_vufind
 
 ; This section will need to be customized for your installation
 [Site]
@@ -23,10 +27,10 @@ email           = team@
 title           = "Generic Katalog (devel)"
 ; This is the default theme for non-mobile devices (or all devices if mobile_theme
 ; is disabled below). Available standard themes:
-;   blueprint =  XHTML theme using Blueprint + jQuery libraries [deprecated]
 ;   bootstrap3 = HTML5 theme using Bootstrap 3 + jQuery libraries, with minimal
 ;               styling
-;   bootprint3 = bootstrap3 theme styled to resemble old blueprint theme
+;   bootprint3 = bootstrap3 theme with more attractive default styling applied
+;                (named after the earlier, now-deprecated blueprint theme)
 theme           = finc
 ; Uncomment the following line to use a different default theme for mobile devices.
 ; You may not wish to use this setting if you are using one of the Bootstrap-based
@@ -82,6 +86,8 @@ defaultAccountPage = Profile
 admin_enabled = false
 ; Show sidebar on the left side instead of right
 sidebarOnLeft = false
+; Invert the sidebarOnLeft setting for right-to-left languages?
+mirrorSidebarInRTL = true
 ; Handle menu as an offcanvas slider at mobile sizes (in bootstrap3-based themes)
 offcanvas = false
 ; Show (true) / Hide (false) Book Bag - Default is Hide.
@@ -91,7 +97,7 @@ bookBagMaxSize = 20
 ; Display bulk items (export, save, etc.) and checkboxes on search result screens?
 showBulkOptions = false
 ; Generator value to display in an HTML header <meta> tag:
-generator = "VuFind 2.4.1"
+generator = "VuFind 2.5"
 
 ; This section allows you to configure the mechanism used for storing user
 ; sessions.  Available types: File, Memcache, Database.
@@ -325,9 +331,6 @@ ils_encryption_key = false
 
 ; When using the Solr mode, specify the address of a Solr server containing a
 ; "stats" core here; if no URL is specified, [Index]/url below will be used.
-;
-; Note: The stats core is disabled by default -- you will need to edit solr/solr.xml
-; to turn it on.
 ;solr            = http://localhost:8080/solr
 
 ; When using the File mode, specify a directory for saving stat files here:
@@ -344,7 +347,9 @@ recordsBySource = false
 ; This section defines the location/behavior of the Solr index and requires no
 ; changes for most installations
 [Index]
-engine          = Solr
+; url can also be an array of servers. If so, VuFind will try the servers one by one
+; until one can be reached. This is only useful for advanced fault-tolerant Solr
+; installations.
 url             = http://localhost:8080/solr
 default_core    = biblio
 ; This setting needs to match the <maxBooleanClauses> setting in your solrconfig.xml
@@ -359,9 +364,8 @@ timeout = 30
 default_dismax_handler = dismax
 
 ; Enable/Disable searching reserves using the "reserves" Solr core.  When enabling
-; this feature, you also need to uncomment the relevant line in solr/solr.xml and
-; restart Solr to enable the reserves core, and you need to run the
-; util/index_reserves.php script to populate the new index.
+; this feature, you need to run the util/index_reserves.php script to populate the
+; new index.
 [Reserves]
 search_enabled  = false
 
@@ -448,23 +452,17 @@ database          = mysql://root@localhost/vufind
 ;userattribute_value_1 = urn:mace:dir:entitlement:common-lib-terms
 ;userattribute_2       = unscoped-affiliation
 ;userattribute_value_2 = member
-
 ; Required: the attribute Shibboleth uses to uniquely identify users.
 ;username              = persistent-id
-
 ; Required: Shibboleth login URL.
 ;login                 = https://shib.myuniversity.edu/Shibboleth.sso/Login
-
 ; Optional: Shibboleth logout URL.
 ;logout                = https://shib.myuniversity.edu/Shibboleth.sso/Logout
-
 ; Optional: URL to forward to after Shibboleth login (if omitted,
 ; defaultLoggedInModule from [Site] section will be used).
 ;target                = https://shib.myuniversity.edu/vufind/MyResearch/Home
-
 ; Optional: provider_id (entityId) parameter to pass along to Shibboleth login.
 ;provider_id           = https://idp.example.edu/shibboleth-idp
-
 ; Some or all of the following entries may be uncommented to map Shibboleth
 ; attributes to user database columns:
 ;cat_username = HTTP_ALEPH_ID
@@ -754,9 +752,18 @@ window_settings = "toolbar=no,location=no,directories=no,buttons=no,status=no,me
 ; If you want to display a graphical link to your link resolver, uncomment the
 ; settings below.  graphic should be a URL; graphic_width and graphic_height
 ; should be sizes in pixels.
-; graphic = "http://myuniversity.edu/images/findIt.gif"
-; graphic_width = 50
-; graphic_height = 20
+;graphic = "http://myuniversity.edu/images/findIt.gif"
+;graphic_width = 50
+;graphic_height = 20
+
+; If your link resolver can render an image in response to an OpenURL, you can
+; specify the base URL for image generation here:
+;dynamic_graphic = "http://my-link-resolver/image"
+
+; If dynamic_graphic is set above, the dynamic image can be used instead of the
+; standard text or static-image-based OpenURL link (true), it can be disabled
+; (false), or it can be displayed in addition to the regular link ("both").
+;image_based_linking_mode = both
 
 ; The following settings control where OpenURL links are displayed:
 show_in_results = true      ; include in search results
@@ -765,7 +772,7 @@ show_in_holdings = false    ; include in holdings tab of record view
 
 ; If set to true, this setting will attempt to embed results from the link
 ; resolver directly in search results instead of opening a new window or page.
-; This will override the window_settings option if set!  Embedding is currently
+; This will override the window_settings option if set! Embedding is currently
 ; unsupported when the resolver setting above is set to "other".
 embed = false
 
@@ -835,12 +842,17 @@ url             = https://www.myendnoteweb.com/EndNoteWeb.html
 ;host = your.proxy.server
 ;port = 8000
 
+; Uncomment following line to set proxy type to SOCKS 5
+;type = socks5
+
 ; Default HTTP settings can be loaded here. These values will be passed to
 ; the \Zend\Http\Client's setOptions method.
 [Http]
 ;sslcapath = "/etc/ssl/certs" ; e.g. for Debian systems
 sslcafile = "/etc/pki/tls/cert.pem" ; e.g. for CentOS systems
 
+;timeout = 30 ; default timeout if not overridden by more specific code/settings
+
 ; Using a curl Adapter instead of the the defaultAdapter (Socket)
 ; adapter = 'Zend\Http\Client\Adapter\Curl'
 
@@ -963,6 +975,12 @@ de          = "German"
 ;pl          = "Polish"
 ;da          = "Danish"
 ;sl          = "Slovene"
+ar          = "Arabic"
+
+; This section contains special cases for languages such as right-to-left support
+[LanguageSettings]
+; Comma-separated list of languages to display in right-to-left mode
+rtl_langs = "ar,he"
 
 ; This section controls the behavior of the Browse module.  The result_limit
 ; setting controls the maximum number of results that may display in any given
@@ -986,14 +1004,24 @@ era             = true      ; allow browsing of era subdivisions
 ; <result_limit> most popular entries -- it only affects display order.
 ;alphabetical_order = true
 
-; This section controls which record export methods are displayed on the Record
-; view screen.  Note that some options may be disabled for records that do not
-; support them, regardless of the setting chosen here.  You can edit the separate
-; export.ini file to add new export formats and change the behavior of existing ones.
+; This section controls the availability of export methods. 
+;
+; Each entry may be a comma-separated list of contexts in which the export
+; option will be presented. Valid options:
+;
+; bulk - Included in batch export contexts
+; record - Included in single-record export contexts
+;
+; If you simply set a field to true, only "record" mode will be enabled.
+; If you set a field to false, all export contexts will be disabled.
+;
+; Note that some options may be disabled for records that do not support them,
+; regardless of the setting chosen here.  You can edit the separate export.ini
+; file to add new export formats and change the behavior of existing ones.
 [Export]
-RefWorks = true
-EndNote = true
-EndNoteWeb = true
+RefWorks = "record,bulk"
+EndNote = "record,bulk"
+EndNoteWeb = "record,bulk"
 MARC = true
 MARCXML = true
 RDF = true
@@ -1001,12 +1029,11 @@ BibTeX = true
 RIS = true
 ;TXT = true
 
-; This section controls whether or not display the bulk export options and which
-; options to display.  Valid methods are EndNote and MARC - The method must also
-; be enabled in Export (above) or it will not be displayed.
 [BulkExport]
-enabled = true
-options = MARC:MARCXML:EndNote:EndNoteWeb:RefWorks:BibTeX:RIS
+; Export behavior to use when no bulkExportType setting is found in the matching
+; format section of export.ini; default is 'link' if not overridden below. See
+; export.ini for more details on available options.
+;defaultType = download
 
 ;AddThis is optional. It uses the Add This tool available from www.addthis.com
 ; and requires the username generated when an analytics account is registered.
@@ -1114,13 +1141,12 @@ dewey = title
 HMACkey = mySuperSecretValue
 
 ; This section sets global defaults for caches; file caching is used by default.
+; A custom directory for caching can be defined by the environment variable
+; VUFIND_CACHE_DIR (see httpd-vufind.conf). The default location is inside the
+; local settings directory.
 ;[Cache]
 ; Set time to live value for Zend caches (in seconds), 0 means maximum possible.
 ;ttl = 0
-; This setting can be used to force caching in a specific location other than the
-; default location inside the local settings directory. This directory must exist
-; and be writable by the web server.
-;cache_dir = "local/cache/"
 ; Override umask for cache directories and files.
 ;umask = 022
 ; Permissions for Zend-created cache directories and files, subject to umask
diff --git a/local/config/vufind/facets.ini b/local/config/vufind/facets.ini
index c3d2d8b5f37e624f9398e64f73435910dadd28e5..f4aad0557f71f983ba41032cf0ca4b2bc47ebd9b 100644
--- a/local/config/vufind/facets.ini
+++ b/local/config/vufind/facets.ini
@@ -82,9 +82,16 @@ dateRange[] = publishDate
 ; These settings affect the way the [Results] facets are displayed
 ; If using facets at the top of search results you have more room for text.
 [Results_Settings]
-facet_limit        = 30     ; how many values should we show for each facet?
-; Specify which facet fields are multi-select (filters are OR'ed instead of AND'ed)
-multiselect_facets = institution,format,language
+; By default, how many values should we show for each facet? (-1 for no limit)
+facet_limit = 30
+; Override facet_limit on a per-field basis using this array:
+;facet_limit_by_field[format] = 50
+; By default, the side facets will only show 6 facets and then the "show more"
+; button. This can get configured with the showMore settings.
+; You can use the * to set a new default setting.
+showMore[*] = 6
+; Or you can set a facet specific value by using the facet name as index.
+;showMore['format'] = 10
 ; Rows and columns for table used by top facets
 ;top_rows = 2
 ;top_cols = 3
@@ -153,9 +160,11 @@ orFacets = *
 special_facets   = "illustrated,daterange"
 
 ; Any facets named in the list below will have their values run through the
-; translation code; unlisted facets will displayed as-is without translation.  For
+; translation code; unlisted facets will displayed as-is without translation. For
 ; translated facets, be sure that all of the necessary strings are included in the
-; language files found in the web/lang directory.  By default, no facets are
+; language files found in the languages directory. You may add a colon and the
+; name of a text domain after the field name to specify translations in a specific
+; text domain (subdirectory of the languages folder). By default, no facets are
 ; translated -- uncomment or add lines below to turn on this feature.
 ;translated_facets[] = institution
 ;translated_facets[] = building
diff --git a/local/config/vufind/searches.ini b/local/config/vufind/searches.ini
index 5ad78313c7ff516e9c8eb33b82c315f9fa8c1583..aa1ef4b06c6603ee5dbc0677c1d33e3e18dd882e 100644
--- a/local/config/vufind/searches.ini
+++ b/local/config/vufind/searches.ini
@@ -57,6 +57,7 @@ default_top_recommend[] = TopFacets:ResultsTop
 default_side_recommend[] = SideFacets:Results:CheckboxFacets
 default_noresults_recommend[] = SwitchType
 default_noresults_recommend[] = SwitchQuery
+;default_noresults_recommend[] = SwitchQuery:::fuzzy
 ;default_noresults_recommend[] = SpellingSuggestions
 
 ; Set this to true in order to highlight keywords from the search query when they
@@ -357,14 +358,16 @@ CallNumber = callnumber-sort
 ;
 ; AlphaBrowseLink:index
 ;       Use the query to generate a link to the specified alphabrowse index
-; SwitchQuery:[backend]:[checks to skip]:[transforms to add]
+; SwitchQuery:[backend]:[opt-out checks to skip]:[opt-in checks to add]
 ;       This module analyzes the user's query and offers suggestions for ways to
 ;       improve it. [backend] is the name of the search backend currently in use,
-;       which will help with accurate analysis (default = Solr). [checks to skip]
-;       is a comma-separated list of checks to disable; see the check*() methods
-;       in the module's code for a complete list of available checks.
-;       [transforms to add] is a comma-separated list of transforms to enable;
-;       currently there is only one: truncatechar
+;       which will help with accurate analysis (default = Solr). [opt-out checks
+;       to skip] is a comma-separated list of checks which are on by default but
+;       which you wish to disable. [opt-in checks to add] is a comma-separated
+;       list of transforms that are off by default but which you wish to enable.
+;       See the check*() methods in the module's code for a complete list of
+;       available checks. The $optInMethods property specifies which checks are
+;       turned off by default.
 ; SwitchType:[field]:[field description]
 ;       If the current search type is not the same as [field], display a link
 ;       suggesting that the user try switching to [field].  [field description]