diff --git a/config/vufind/config.ini b/config/vufind/config.ini
index 5bb598508808a74c83cfae5c20921ebc9d27010d..6a3a5a81c150602749d299700ecefac05e6d8439 100644
--- a/config/vufind/config.ini
+++ b/config/vufind/config.ini
@@ -23,11 +23,11 @@ email           = support@myuniversity.edu
 title           = "Library Catalog"
 ; 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
+;   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 blueprint theme
-theme           = blueprint
+;   bootprint3 = bootstrap3 theme styled to resemble old blueprint theme
+theme           = bootprint3
 ; 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
 ; standard themes since they support responsive design. Available mobile theme:
@@ -82,8 +82,7 @@ defaultAccountPage = Favorites
 admin_enabled = false
 ; Show sidebar on the left side instead of right
 sidebarOnLeft = false
-; Show (true) / Hide (false) Book Bag - Default is Hide.  The Book Bag is currently
-; only supported by the blueprint theme; other themes will ignore this setting.
+; Show (true) / Hide (false) Book Bag - Default is Hide.
 showBookBag = false
 ; Set the maximum amount of items allowed in the Book Bag - Default is 100
 bookBagMaxSize = 100
@@ -1081,7 +1080,6 @@ HMACkey = mySuperSecretValue
 
 ; This section controls the "Collections" module -- the special view for records
 ; that represent collections, and the mechanism for browsing these records.
-; Collections are only supported in the blueprint and jquerymobile themes.
 ;[Collections]
 ; Control whether or not the collections module is enabled in search results.
 ; If set to true any search results which are collection level items will
diff --git a/module/VuFind/src/VuFind/Config/Upgrade.php b/module/VuFind/src/VuFind/Config/Upgrade.php
index dfeee51de8806ce5476c4cae93a6627b6720dcef..29baac4376974e5701456a73f1dd92f7a64cba88 100644
--- a/module/VuFind/src/VuFind/Config/Upgrade.php
+++ b/module/VuFind/src/VuFind/Config/Upgrade.php
@@ -575,7 +575,7 @@ class Upgrade
         unset($newConfig['Index']['local']);
 
         // Warn the user if they are using an unsupported theme:
-        $this->checkTheme('theme', 'blueprint');
+        $this->checkTheme('theme', 'bootprint3');
         $this->checkTheme('mobile_theme', 'jquerymobile');
 
         // Translate legacy auth settings:
diff --git a/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/CartTest.php b/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/CartTest.php
index ecb716892ebde19f84828035d63563f8e0130b50..63274950cd7b135fb5f34f118f6f2dc5bb6bb1a3 100644
--- a/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/CartTest.php
+++ b/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/CartTest.php
@@ -47,7 +47,7 @@ class CartTest extends \VuFindTest\Unit\MinkTestCase
     {
         // Activate the cart:
         $this->changeConfigs(
-            ['config' => ['Site' => ['showBookBag' => true]]]
+            ['config' => ['Site' => ['showBookBag' => true, 'theme' => 'blueprint']]]
         );
 
         $session = $this->getMinkSession();
@@ -60,10 +60,12 @@ class CartTest extends \VuFindTest\Unit\MinkTestCase
         $updateCart = $page->find('css', '#updateCart');
         $this->assertTrue(is_object($updateCart));
         $updateCart->click();
+        $content = $page->find('css', '#contextHelpContent');
+        $this->assertTrue(is_object($content));
         $this->assertEquals(
             'No items were selected. '
             . 'Please click on a checkbox next to an item and try again.',
-            $page->find('css', '#contextHelpContent')->getText()
+            $content->getText()
         );
 
         // Now actually select something:
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Config/UpgradeTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Config/UpgradeTest.php
index ee4fc3a2030dea4b6cd1582e233102dc409764df..3600da0f165a26ee1c57308813d94e4d11d46fd5 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Config/UpgradeTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Config/UpgradeTest.php
@@ -101,7 +101,7 @@ class UpgradeTest extends \VuFindTest\Unit\TestCase
             $this->assertEquals(
                 "WARNING: This version of VuFind does not support "
                 . "the default theme.  Your config.ini [Site] theme setting "
-                . "has been reset to the default: blueprint.  You may need to "
+                . "has been reset to the default: bootprint3.  You may need to "
                 . "reimplement your custom theme.",
                 $warnings[0]
             );
diff --git a/module/VuFindTheme/Module.php b/module/VuFindTheme/Module.php
index 7de985e38ac8ca4599f67944c91ee68d6b61c941..26b0d39276d8b8a3c79a52b20189c98ac4035e2f 100644
--- a/module/VuFindTheme/Module.php
+++ b/module/VuFindTheme/Module.php
@@ -100,6 +100,6 @@ class Module
      */
     public static function getThemeInfo()
     {
-        return new ThemeInfo(realpath(__DIR__ . '/../../themes'), 'blueprint');
+        return new ThemeInfo(realpath(__DIR__ . '/../../themes'), 'bootprint3');
     }
 }