diff --git a/CHANGELOG b/CHANGELOG
index 5ed97a60e..b7b5a841f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -167,8 +167,9 @@
 --------------------------------------------------------------------------------
 - add hooks showDocumentAttribute and showDocumentContentAttribute in Search view
 - fix layout problems of select2 menu, add option for adding an icon to each option
-- better import for users from csv file
+- better import of users from csv file
 - fix various methods in restapi (Closes: #481)
+- add hooks showDocumentKeywords and showDocumentCategories
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.18
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index f5fa33a8f..6f390887e 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1553,8 +1553,8 @@ $(document).ready(function() {
 		<p>'.getMLText('keywords_loading').'</p>
   </div>
   <div class="modal-footer">
-    <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true">'. getMLText("close").'</button>
-    <button class="btn" data-dismiss="modal" aria-hidden="true" id="acceptkeywords"><i class="icon-save"></i> '.getMLText("save").'</button>
+    <button class="btn" data-dismiss="modal" aria-hidden="true">'. getMLText("close").'</button>
+    <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true" id="acceptkeywords"><i class="icon-save"></i> '.getMLText("save").'</button>
   </div>
 </div>';
 		return $content;
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index d7997892b..6b3ae393f 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -527,7 +527,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site'));
 										echo "<option value=\"".$key."\"";
 										if(in_array($key, $selections))
 											echo " selected";
-										echo ">".htmlspecialchars($opt)."</option>";
+										echo ">".htmlspecialchars(getMLText($extname.'_'.$opt, array(), $opt))."</option>";
 									}
 									echo "</select>";
 								} elseif(!empty($conf['internal'])) {
@@ -619,7 +619,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site'));
 <?php
 if(is_writeable($settings->_configFilePath)) {
 ?>
-  <button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button>
+  <button type="submit" class="btn btn-primary"><i class="icon-save"></i> <?php printMLText("save")?></button>
 <?php
 }
 ?>
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 8c4264208..e4792b53b 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -282,27 +282,47 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 <?php
 		}
 		if($document->getKeywords()) {
+			$arr = $this->callHook('showDocumentKeywords', $document);
+			if(is_array($arr)) {
+				echo "<tr>";
+				echo "<td>".$arr[0].":</td>";
+				echo "<td>".$arr[1]."</td>";
+				echo "</tr>";
+			} elseif(is_string($arr)) {
+				echo $arr;
+			} else {
 ?>
 		<tr>
 		<td><?php printMLText("keywords");?>:</td>
 		<td><?php print htmlspecialchars($document->getKeywords());?></td>
 		</tr>
 <?php
+			}
 		}
 		if($cats = $document->getCategories()) {
+			$arr = $this->callHook('showDocumentCategories', $document);
+			if(is_array($arr)) {
+				echo "<tr>";
+				echo "<td>".$arr[0].":</td>";
+				echo "<td>".$arr[1]."</td>";
+				echo "</tr>";
+			} elseif(is_string($arr)) {
+				echo $arr;
+			} else {
 ?>
 		<tr>
 		<td><?php printMLText("categories");?>:</td>
 		<td>
-		<?php
-			$ct = array();
-			foreach($cats as $cat)
-				$ct[] = htmlspecialchars($cat->getName());
-			echo implode(', ', $ct);
-		?>
+<?php
+				$ct = array();
+				foreach($cats as $cat)
+					$ct[] = htmlspecialchars($cat->getName());
+				echo implode(', ', $ct);
+?>
 		</td>
 		</tr>
 <?php
+			}
 		}
 ?>
 		<?php