diff --git a/CHANGELOG b/CHANGELOG
index 456417f3a..90c8359a7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -255,6 +255,9 @@
 - various improvements of fulltext service
 - show number of documents per category in category manager
 - show number of keywords per category in keyword manager
+- improve drag&drop with clipboard
+- old pear packages for SeedDMS/Core, SeedDMS/Lucene, SeedDMS/Preview
+  are now based on composer and has moved into vendor dir
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.28
diff --git a/build.xml b/build.xml
index eca4d945c..e2f6e0b81 100644
--- a/build.xml
+++ b/build.xml
@@ -151,24 +151,24 @@
 		<copy todir="${builddir}/export/${shortversion}/www/ext/example">
 			<fileset dir="${srcdir}/ext/example" defaultexcludes="false" />
 		</copy>
-		<copy todir="${builddir}/export/${shortversion}/pear/SeedDMS">
-      <!-- fileset dir="SeedDMS_Core">
+		<!-- copy todir="${builddir}/export/${shortversion}/pear/SeedDMS">
+      <fileset dir="SeedDMS_Core">
 				<include name="Core/**" />
 				<include name="Core.php" />
-			</fileset -->
+			</fileset>
       <fileset dir="SeedDMS_Preview">
 				<include name="Preview/**" />
 				<include name="Preview.php" />
 			</fileset>
-      <!-- fileset dir="SeedDMS_Lucene">
+      <fileset dir="SeedDMS_Lucene">
 				<include name="Lucene/**" />
 				<include name="Lucene.php" />
 			</fileset -->
       <!-- fileset dir="SeedDMS_SQLiteFTS">
 				<include name="SQLiteFTS/**" />
 				<include name="SQLiteFTS.php" />
-			</fileset -->
-		</copy>
+			</fileset>
+		</copy -->
 		<!-- copy todir="${builddir}/export/${shortversion}/pear">
 			<fileset dir="../seeddms-ext/http_webdav_server">
 				<include name="HTTP/WebDAV/Server/**" />
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index d93ee23ed..5d7d9f3d0 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -502,7 +502,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			/* clipboard {{{ */
 			if($this->params['enableclipboard']) {
 				echo "   <div id=\"menu-clipboard\">";
-				echo "     <div class=\"ajax\" data-no-spinner=\"true\" data-view=\"Clipboard\" data-action=\"menuClipboard\" data-query=\"folderid=".($folder != null ? $folder->getID() : 0)."\"></div>";
+				echo "     <div class=\"ajax add-clipboard-area\" data-no-spinner=\"true\" data-view=\"Clipboard\" data-action=\"menuClipboard\" data-query=\"folderid=".($folder != null ? $folder->getID() : 0)."\"></div>";
 				echo "   </div>";
 			}
 			/* }}} End of clipboard */
diff --git a/views/bootstrap/class.Clipboard.php b/views/bootstrap/class.Clipboard.php
index 1f157e88d..f1c97fa97 100644
--- a/views/bootstrap/class.Clipboard.php
+++ b/views/bootstrap/class.Clipboard.php
@@ -48,54 +48,25 @@ class SeedDMS_View_Clipboard extends SeedDMS_Theme_Style {
 
 		$menuitems = [];
 
-		$content = '';
-		$content .= "   <ul id=\"main-menu-clipboard\" class=\"nav pull-right\">\n";
-		$content .= "    <li class=\"dropdown add-clipboard-area\">\n";
-		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-clipboard-area\">".getMLText('clipboard')." (".count($clipboard['folders'])."/".count($clipboard['docs']).") <i class=\"fa fa-caret-down\"></i></a>\n";
-		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		$subitems = [];
 		foreach($clipboard['folders'] as $folderid) {
 			if($folder = $this->params['dms']->getFolder($folderid)) {
-				$content .= "    <li><a href=\"".$this->params['settings']->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID()."\" class=\"table-row-folder droptarget\" data-droptarget=\"folder_".$folder->getID()."\" rel=\"folder_".$folder->getID()."\" data-name=\"".htmlspecialchars($folder->getName(), ENT_QUOTES)."\" data-uploadformtoken=\"".createFormKey('')."\" formtoken=\"".createFormKey('')."\"><i class=\"fa fa-folder-o\"></i> ".htmlspecialchars($folder->getName())."</a></li>\n";
-				$subitems[] = array('label'=>'<i class="fa fa-folder-o"></i> '.$folder->getName(), 'link'=>$this->params['settings']->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(), 'class'=>"table-row-folder droptarget", 'rel'=>"folder_".$folder->getID(), 'attributes'=>array(array('data-droptarget', "folder_".$folder->getID()), array('data-name', htmlspecialchars($folder->getName(), ENT_QUOTES))));
+				$subitems[] = array('label'=>'<i class="fa fa-folder-o"></i> '.$folder->getName(), 'link'=>$this->params['settings']->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(), 'class'=>"table-row-folder droptarget", 'attributes'=>array(array('data-droptarget', "folder_".$folder->getID()), array('rel', "folder_".$folder->getID()), array('data-name', htmlspecialchars($folder->getName(), ENT_QUOTES))));
 			}
 		}
 		foreach($clipboard['docs'] as $docid) {
 			if($document = $this->params['dms']->getDocument($docid))
-				$content .= "    <li><a href=\"".$this->params['settings']->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID()."\" class=\"table-row-document droptarget\" data-droptarget=\"document_".$document->getID()."\" rel=\"document_".$document->getID()."\" data-name=\"".htmlspecialchars($document->getName(), ENT_QUOTES)."\" formtoken=\"".createFormKey('')."\"><i class=\"fa fa-file\"></i> ".htmlspecialchars($document->getName())."</a></li>\n";
-				$subitems[] = array('label'=>'<i class="fa fa-file"></i> '.$document->getName(), 'link'=>$this->params['settings']->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(), 'class'=>"table-row-document droptarget", 'rel'=>"document_".$document->getID(), 'attributes'=>array(array('data-droptarget', "document_".$document->getID()), array('data-name', htmlspecialchars($document->getName(), ENT_QUOTES))));
+				$subitems[] = array('label'=>'<i class="fa fa-file"></i> '.$document->getName(), 'link'=>$this->params['settings']->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(), 'class'=>"table-row-document droptarget", 'attributes'=>array(array('data-droptarget', "document_".$document->getID()), array('rel', "document_".$document->getID()), array('formtoken', createFormKey('')), array('data-name', htmlspecialchars($document->getName(), ENT_QUOTES))));
 		}
-		$content .= "    <li class=\"divider\"></li>\n";
 		$subitems[] = array('divider'=>true);
 		if(isset($this->params['folder']) && $this->params['folder']->getAccessMode($this->params['user']) >= M_READWRITE) {
-			$content .= "    <li><a href=\"".$this->params['settings']->_httpRoot."op/op.MoveClipboard.php?targetid=".$this->params['folder']->getID()."&refferer=".urlencode($this->params['settings']->_httpRoot.'out/out.ViewFolder.php?folderid='.$this->params['folder']->getID())."\">".getMLText("move_clipboard")."</a></li>\n";
 			$subitems[] = array('label'=>getMLText("move_clipboard"), 'link'=>$this->params['settings']->_httpRoot."op/op.MoveClipboard.php?targetid=".$this->params['folder']->getID()."&refferer=".urlencode($this->params['settings']->_httpRoot.'out/out.ViewFolder.php?folderid='.$this->params['folder']->getID()));
 		}
-//		$content .= "    <li><a href=\"../op/op.ClearClipboard.php?refferer=".urlencode($this->params['refferer'])."\">".getMLText("clear_clipboard")."</a><a class=\"ajax-click\" data-href=\"../op/op.Ajax.php\" data-param1=\"command=clearclipboard\">kkk</a> </li>\n";
-//		$content .= "    <li><a class=\"ajax-click\" data-href=\"../op/op.Ajax.php\" data-param1=\"command=clearclipboard\">".getMLText("clear_clipboard")."</a></li>\n";
 		$subitems[] = array('label'=>getMLText('clear_clipboard'), 'class'=>'ajax-click', 'attributes'=>array(array('data-href', $this->params['settings']->_httpRoot.'op/op.Ajax.php'), array('data-param1', 'command=clearclipboard')));
 		if($this->hasHook('clipboardMenuItems'))
 			$subitems = $this->callHook('clipboardMenuItems', $clipboard, $subitems);
-		/*
-		foreach($menuitems as $menuitem) {
-			$content .= "<li>";
-			$content .= "<a";
-			if(!empty($menuitem['link']))
-				$content .= ' href="'.$menuitem['link'].'"';
-			if(!empty($menuitem['attributes']))
-				foreach($menuitem['attributes'] as $attr)
-					$content .= ' '.$attr[0].'="'.$attr[1].'"';
-			$content .= ">";
-			$content .= getMLText($menuitem['label']);
-			$content .= "</a></li>";
-		}
-		 */
-		$content .= "     </ul>\n";
-		$content .= "    </li>\n";
-		$content .= "   </ul>\n";
 		$menuitems['clipboard'] = array('label'=>getMLText('clipboard')." (".count($clipboard['folders'])."/". count($clipboard['docs']).")", 'children'=>$subitems);
 		self::showNavigationBar($menuitems, array('right'=>true));
-//		echo $content;
 	} /* }}} */
 
 	/**
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 6f37a8007..850344b99 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -397,7 +397,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			/* clipboard {{{ */
 			if($this->params['enableclipboard']) {
 				echo "   <div id=\"menu-clipboard\">";
-				echo "     <div class=\"ajax\" data-no-spinner=\"true\" data-view=\"Clipboard\" data-action=\"menuClipboard\" data-query=\"folderid=".($folder != null ? $folder->getID() : 0)."\"></div>";
+				echo "     <div class=\"ajax add-clipboard-area\" data-no-spinner=\"true\" data-view=\"Clipboard\" data-action=\"menuClipboard\" data-query=\"folderid=".($folder != null ? $folder->getID() : 0)."\"></div>";
 				echo "   </div>";
 			}
 			/* }}} End of clipboard */