diff --git a/CHANGELOG b/CHANGELOG
index 84d78a95d..a1265514a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -209,6 +209,7 @@
   RemoveFolder::run was called more than once
 - fix php error setting mandatory workflow when uploading documents via webdav
 - typeahead search for folders can search in subfolders
+- new theme based on bootstrap 4, including many improvements on small displays
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.22
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index accd644a6..adaa9e3c0 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -669,7 +669,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$content = '';
 		$content .= "<ul".(isset($options['id']) ? ' id="'.$options['id'].'"' : '')." class=\"nav nav-list sidenav bs-docs-sidenav\">\n";
 		foreach($menuitems as $menuitem) {
-			$content .= "  <li class=\"\">\n";
+			$content .= "  <li class=\"".(!empty($menuitem['active']) ? ' active' : '')."\">\n";
 			$content .= '    <a';
 			$content .= !empty($menuitem['link']) ? 'href="'.$menuitem['link'].'"' : '';
 			if(!empty($menuitem['attributes']))
diff --git a/views/bootstrap/class.Clipboard.php b/views/bootstrap/class.Clipboard.php
index b2df501e0..063a34808 100644
--- a/views/bootstrap/class.Clipboard.php
+++ b/views/bootstrap/class.Clipboard.php
@@ -119,9 +119,12 @@ class SeedDMS_View_Clipboard extends SeedDMS_Theme_Style {
 		$content .= $this->folderListRowStart($folder);
 		$content .= "<td><a draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."&showtree=".showtree()."\"><img draggable=\"false\" src=\"".$this->getMimeIcon(".folder")."\" width=\"24\" height=\"24\" border=0></a></td>\n";
 		$content .= "<td><a draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."&showtree=".showtree()."\">" . htmlspecialchars($folder->getName()) . "</a>";
+		/*
 		if($comment) {
 			$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
 		}
+		 */
+		$content .= $this->getListRowPath($folder);
 		$content .= "</td>\n";
 		$content .= "<td>\n";
 		$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"F".$folder->getID()."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"fa fa-remove\"></i></a></div>";
@@ -165,9 +168,12 @@ class SeedDMS_View_Clipboard extends SeedDMS_Theme_Style {
 				$content .= "<td><img draggable=\"false\" class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\"></td>";
 			
 			$content .= "<td><a draggable=\"false\" href=\"out.ViewDocument.php?documentid=".$document->getID()."&showtree=".showtree()."\">" . htmlspecialchars($document->getName()) . "</a>";
+			/*
 			if($comment) {
 				$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
 			}
+			 */
+			$content .= $this->getListRowPath($document);
 			$content .= "</td>\n";
 			$content .= "<td>\n";
 			$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"D".$document->getID()."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$document->getID()."&type=document\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"fa fa-remove\"></i></a></div>";
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index f3d6de993..17b395b69 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -593,7 +593,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$content = '';
 		$content .= "<ul".(isset($options['id']) ? ' id="'.$options['id'].'"' : '')." class=\"list-group sidenav\">\n";
 		foreach($menuitems as $menuitem) {
-			$content .= "  <li class=\"list-group-item d-flex justify-content-between align-items-center\">\n";
+			$content .= "  <li class=\"list-group-item d-flex justify-content-between align-items-center".(!empty($menuitem['active']) ? ' active' : '')."\">\n";
 			$content .= '    <a';
 			$content .= !empty($menuitem['link']) ? 'href="'.$menuitem['link'].'"' : '';
 			if(!empty($menuitem['attributes']))