diff --git a/htroot/ConfigUpdate_p.html b/htroot/ConfigUpdate_p.html
index 2ad4a8b3b..6c12e6318 100644
--- a/htroot/ConfigUpdate_p.html
+++ b/htroot/ConfigUpdate_p.html
@@ -28,8 +28,8 @@
         <option #(selected)#::selected="selected"#(/selected)# value="#[url]#">#[name]# #(signatures)#(unsigned)::(signed)#(/signatures)#</option>
         #{/availreleases}#
         </select>
-    	&nbsp;&nbsp;<input type="submit" name="downloadRelease" value="Download Release"/>
-    	&nbsp;&nbsp;<input type="submit" name="checkRelease" value="Check for new Release"/>
+    	&nbsp;&nbsp;<input type="submit" name="downloadRelease" class="btn btn-primary" value="Download Release"/>
+    	&nbsp;&nbsp;<input type="submit" name="checkRelease" class="btn btn-default" value="Check for new Release"/>
       </p></form></dd>
       <dt><br />Downloaded Releases</dt>
       <dd><form action="ConfigUpdate_p.html" method="get" accept-charset="UTF-8"><p>
@@ -43,14 +43,14 @@
         #{/downloadedreleases}#
         #(downloadsAvailable)#::</select>#(/downloadsAvailable)#
         #(deployenabled)#::no&nbsp;automated installation on development environments::
-    	&nbsp;&nbsp;<input type="submit" name="update" value="Install Release" #(buttonsActive)#disabled="disabled"::#(/buttonsActive)#/>
-        &nbsp;&nbsp;<input type="submit" name="deleteRelease" value="Delete Release" #(buttonsActive)#disabled="disabled"::#(/buttonsActive)#/>
+    	&nbsp;&nbsp;<input type="submit" name="update" class="btn btn-primary" value="Install Release" #(buttonsActive)#disabled="disabled"::#(/buttonsActive)#/>
+        &nbsp;&nbsp;<input type="submit" name="deleteRelease" class="btn btn-danger" value="Delete Release" #(buttonsActive)#disabled="disabled"::#(/buttonsActive)#/>
         #(/deployenabled)#		
       </p></form></dd>
       <dt><br />Automatic Update</dt>
       <dd><form action="ConfigUpdate_p.html" method="get" accept-charset="UTF-8"><p>
         &nbsp;check for new releases, download if available and restart with downloaded release<br />
-        &nbsp;&nbsp;<input type="submit" name="autoUpdate" value="Check + Download + Install Release Now" /><br />
+        &nbsp;&nbsp;<input type="submit" name="autoUpdate" class="btn btn-primary" value="Check + Download + Install Release Now" /><br />
         #(autoUpdate)#::
         <div class="commit">Download of release #[downloadedRelease]# finished. Restart Initiated.</div>::
         <div class="error">No more recent release found.</div>::
@@ -99,7 +99,7 @@
         <input type="checkbox" name="onlySignedFiles" value="true" #(onlySignedFiles)#::checked="checked" #(/onlySignedFiles)#/>
         only accept signed files
       </dd>
-      <dt><input type="submit" name="configSubmit" value="Submit" /></dt>
+      <dt><input type="submit" name="configSubmit" class="btn btn-primary" value="Submit" /></dt>
       <dd>#(configCommit)#&nbsp;::<div class="commit">Accepted Changes.</div>#(/configCommit)#</dd>
       </dl>
       </fieldset>
diff --git a/htroot/ContentIntegrationPHPBB3_p.html b/htroot/ContentIntegrationPHPBB3_p.html
index dfe74937c..c22651f80 100644
--- a/htroot/ContentIntegrationPHPBB3_p.html
+++ b/htroot/ContentIntegrationPHPBB3_p.html
@@ -69,7 +69,7 @@
       <fieldset>
         <dl>
           <dt><b>Import a database dump</b>,<br /></dt>
-          <dd><input type="text" name="content.phpbb3.dumpfile" value="#[content.phpbb3.dumpfile]#" size="60" /></dd>
+          <dd><input type="file" name="content.phpbb3.dumpfile" value="#[content.phpbb3.dumpfile]#" size="60" /></dd>
           <dt>&nbsp;</dt>
           <dd>
             <input type="submit" name="import" value="Import Dump" class="btn btn-primary" style="width:240px"/>
diff --git a/htroot/IndexImportOAIPMHList_p.html b/htroot/IndexImportOAIPMHList_p.html
index 2da1a4cd6..e58cb70b5 100644
--- a/htroot/IndexImportOAIPMHList_p.html
+++ b/htroot/IndexImportOAIPMHList_p.html
@@ -25,7 +25,7 @@
     <form action="IndexImportOAIPMH_p.html" target="_top" method="post" enctype="multipart/form-data" accept-charset="UTF-8" id="oaipmhimport">
     <p>
     <input type="hidden" name="num" value="#[num]#" />
-    <input type="submit" name="loadrows" value="Load Selected Sources" />
+    <input type="submit" name="loadrows" class="btn btn-primary" value="Load Selected Sources" />
     </p>
 	<!-- Making the following table sortable could really consume some CPU if the list is huge - remove the class="sortable" if that is not desired ! -->
     <table class="sortable" >
@@ -41,7 +41,7 @@
       #{/table}#
     </table>
     <p>
-    <input type="submit" name="loadrows" value="Load Selected Sources" />
+    <input type="submit" name="loadrows" class="btn btn-primary" value="Load Selected Sources" />
     </p>
     </form>
     #(/source)#
diff --git a/htroot/IndexImportOAIPMH_p.html b/htroot/IndexImportOAIPMH_p.html
index 757645fe6..671d3acdd 100644
--- a/htroot/IndexImportOAIPMH_p.html
+++ b/htroot/IndexImportOAIPMH_p.html
@@ -17,7 +17,7 @@
         <legend>Single request import</legend>
         This will submit only a single request as given here to a OAI-PMH server and imports records into the index<br />
         <input name="urlstartone" type="text" value="#[defaulturl]#" size="80" />
-        <input name="submit" type="submit" value="Import OAI-PMH source" />
+        <input name="submit" type="submit" class="btn btn-primary" value="Import OAI-PMH source" />
         #(import-one)#::
         <p><dl>
           <dt>Source:</dt><dd>#[source]#</dd>
@@ -35,8 +35,8 @@
           <legend>Import all Records from a server</legend>
           Import all records that follow according to resumption elements into index<br />
           <input name="urlstart" type="text" value="" size="80" />
-          <input name="importroot" type="submit" value="import this source" />
-          #(optiongetlist)#::or&nbsp;<input name="getlist" type="submit" value="import from a list" />#(/optiongetlist)#
+          <input name="importroot" type="submit" class="btn btn-primary" value="import this source" />
+          #(optiongetlist)#::or&nbsp;<input name="getlist" type="submit" class="btn btn-primary" value="import from a list" />#(/optiongetlist)#
           #(status)#::<p>Import started!</p>::<p>Bad input data: #[message]# </p>#(/status)#
         </fieldset>
     </form>
diff --git a/htroot/Load_RSS_p.html b/htroot/Load_RSS_p.html
index 79249373b..2352ab9aa 100644
--- a/htroot/Load_RSS_p.html
+++ b/htroot/Load_RSS_p.html
@@ -32,7 +32,7 @@
           <dt><b>URL of the RSS feed</b></dt>
           <dd><input type="text" name="url" value="#[url]#" size="60" maxlength="256"/></dd>
           <dt>Preview</dt>
-          <dd><input type="submit" name="showrss" value="Show RSS Items" /></dd>
+          <dd><input type="submit" name="showrss" class="btn btn-default" value="Show RSS Items" /></dd>
           <dt>Indexing</dt>
           <dd>#(showload)#<input type="hidden" name="collection" id="collection" value="#[collection]#" />Available after successful loading of rss feed in preview::
           <dl>
@@ -57,7 +57,7 @@
             <dt>collection</dt>
             <dd><input name="collection" id="collection" type="text" size="60" maxlength="100" value="#[collection]#" #(collectionEnabled)#disabled="disabled"::#(/collectionEnabled)# /></dd>
           </dl>
-          <input type="submit" name="indexAllItemContent" value="Add All Items to Index (full content of url)" />
+          <input type="submit" name="indexAllItemContent" class="btn btn-primary" value="Add All Items to Index (full content of url)" />
           #(/showload)#</dd>
           #(showerrmsg)#::<dd class="error">#[msgtxt]#</dd>#(/showerrmsg)#   
         </dl>
@@ -95,8 +95,8 @@
       </table>
       <p>
       <input type="hidden" name="num" value="#[num]#" />
-      <input type="submit" name="removeSelectedFeedsScheduler" value="Remove Selected Feeds from Scheduler" />
-      <input type="submit" name="removeAllFeedsScheduler" value="Remove All Feeds from Scheduler" />
+      <input type="submit" name="removeSelectedFeedsScheduler" class="btn btn-danger" value="Remove Selected Feeds from Scheduler" />
+      <input type="submit" name="removeAllFeedsScheduler" class="btn btn-danger" value="Remove All Feeds from Scheduler" />
       </p>
     </fieldset></form>
 	#(/showscheduledfeeds)#
@@ -122,9 +122,9 @@
       </table>
       <p>
       <input type="hidden" name="num" value="#[num]#" />
-      <input type="submit" name="removeSelectedFeedsNewList" value="Remove Selected Feeds from Feed List" />
-      <input type="submit" name="removeAllFeedsNewList" value="Remove All Feeds from Feed List" />
-      <input type="submit" name="addSelectedFeedScheduler" value="Add Selected Feeds to Scheduler" />
+      <input type="submit" name="removeSelectedFeedsNewList" class="btn btn-danger" value="Remove Selected Feeds from Feed List" />
+      <input type="submit" name="removeAllFeedsNewList" class="btn btn-danger" value="Remove All Feeds from Feed List" />
+      <input type="submit" name="addSelectedFeedScheduler" class="btn btn-primary" value="Add Selected Feeds to Scheduler" />
       </p>
     </fieldset></form>
 	#(/shownewfeeds)#
@@ -168,7 +168,7 @@
       <p>
       <input type="hidden" name="num" value="#[num]#" />
       <input type="hidden" name="url" value="#[rss]#" />
-      <input type="submit" name="indexSelectedItemContent" value="Add Selected Items to Index (full content of url)" />
+      <input type="submit" name="indexSelectedItemContent" class="btn btn-primary" value="Add Selected Items to Index (full content of url)" />
       </p>
     </fieldset></form>
 	#(/showitems)#
diff --git a/htroot/Messages_p.html b/htroot/Messages_p.html
index ada0b2bd6..e4a53f9bf 100644
--- a/htroot/Messages_p.html
+++ b/htroot/Messages_p.html
@@ -17,7 +17,7 @@
           <select id="peers" name="hash">#{peers}#
             <option value="#[hash]#">#[name]#</option>#{/peers}#
           </select>
-          <input type="submit" name="submit" value="Compose" />
+          <input type="submit" name="submit" class="btn btn-primary" value="Compose" />
         </dd>
       </dl>
     </fieldset></form>
diff --git a/htroot/Network.html b/htroot/Network.html
index 10ddee8c1..3b7ea9201 100644
--- a/htroot/Network.html
+++ b/htroot/Network.html
@@ -102,7 +102,7 @@ document.getElementById("apilink").setAttribute("href", "Network.xml?" + window.
         <label for="match">Search for a peername (RegExp allowed)</label>:
         <input type="text" id="match" name="match" value="#[searchpattern]#" />
         <input type="hidden" name="page" value="#[page]#" />
-        <input type="submit" name="search" value="Search" />
+        <input type="submit" name="search" class="btn btn-default" value="Search" />
       </fieldset>
     </form>
     <table class="sortable" border="0">
@@ -354,7 +354,7 @@ document.getElementById("apilink").setAttribute("href", "Network.xml?" + window.
         </tr>
         <tr>
           <td>&nbsp;<input name="page" type="hidden" value="4" /></td>
-          <td><input type="submit" name="addPeer" value="add Peer" /></td>
+          <td><input type="submit" name="addPeer" class="btn btn-primary" value="add Peer" /></td>
         </tr>
       </table>
     </form>
diff --git a/htroot/RankingRWI_p.html b/htroot/RankingRWI_p.html
index b2a631b82..4dd1fe3b4 100644
--- a/htroot/RankingRWI_p.html
+++ b/htroot/RankingRWI_p.html
@@ -60,8 +60,8 @@
         </dl>
       </fieldset>
       <fieldset>
-        <input type="submit" name="EnterRanking" value="Set as Default Ranking" />
-        <input type="submit" name="ResetRanking" value="Re-Set to Built-In Ranking" />
+        <input type="submit" name="EnterRanking" class="btn btn-primary" value="Set as Default Ranking" />
+        <input type="submit" name="ResetRanking" class="btn btn-primary" value="Re-Set to Built-In Ranking" />
       </fieldset>
     </form>
 
diff --git a/htroot/ServerScannerList.html b/htroot/ServerScannerList.html
index d84acb0f0..e23cc7fc3 100644
--- a/htroot/ServerScannerList.html
+++ b/htroot/ServerScannerList.html
@@ -49,7 +49,7 @@
       #(edit)#::
       <p>
       <input type="hidden" name="num" value="#[num]#" />
-      <input type="submit" name="crawl" value="Add Selected Servers to Crawler" />
+      <input type="submit" name="crawl" class="btn btn-primary" value="Add Selected Servers to Crawler" />
       </p>
       #(/edit)#
     </fieldset></form>
diff --git a/htroot/Settings_Crawler.inc b/htroot/Settings_Crawler.inc
index 112fa9f0a..c451e046b 100644
--- a/htroot/Settings_Crawler.inc
+++ b/htroot/Settings_Crawler.inc
@@ -44,7 +44,7 @@
   
   <tr valign="top">
     <td>&nbsp;</td>
-    <td><input type="submit" name="crawlerSettings" value="Submit" /></td>
+    <td><input type="submit" name="crawlerSettings" class="btn btn-primary" value="Submit" /></td>
     <td><em>Changes will take effect immediately.</em></td>
   </tr>  
 </table>
diff --git a/htroot/Settings_MessageForwarding.inc b/htroot/Settings_MessageForwarding.inc
index 958f71aec..c0634d39c 100644
--- a/htroot/Settings_MessageForwarding.inc
+++ b/htroot/Settings_MessageForwarding.inc
@@ -24,7 +24,7 @@
     </td>
   </tr>
   <tr valign="top">
-    <td colspan="3"><input type="submit" name="msgForwarding" value="Submit" /> <em>Changes will take effect immediately.</em></td>
+    <td colspan="3"><input type="submit" name="msgForwarding" class="btn btn-primary" value="Submit" /> <em>Changes will take effect immediately.</em></td>
   </tr>
 </table>
 </fieldset>
diff --git a/htroot/Settings_Proxy.inc b/htroot/Settings_Proxy.inc
index 84f469752..365cfa8ea 100644
--- a/htroot/Settings_Proxy.inc
+++ b/htroot/Settings_Proxy.inc
@@ -51,7 +51,7 @@
   
   <!-- submit button -->
   <tr valign="top">
-    <td colspan="4"><input type="submit" name="proxysettings" value="Submit" /> <em>Changes will take effect immediately.</em></td>
+    <td colspan="4"><input type="submit" name="proxysettings" class="btn btn-primary" value="Submit" /> <em>Changes will take effect immediately.</em></td>
   </tr>
 </table>
 </fieldset>
diff --git a/htroot/Settings_Seed.inc b/htroot/Settings_Seed.inc
index 1c23fde62..aef5d71ae 100644
--- a/htroot/Settings_Seed.inc
+++ b/htroot/Settings_Seed.inc
@@ -19,7 +19,7 @@
 		<option value="#[name]#"#(selected)#:: selected="selected"#(/selected)#>#[name]#</option>
 #{/seedUploadMethods}#
 		</select>
-		<input type="submit" name="seedSettings" value="Submit" />
+		<input type="submit" name="seedSettings" class="btn btn-primary" value="Submit" />
     </td>
     <td><em>Here you can specify which upload method should be used. Select 'none' to deactivate uploading.</em></td>
   </tr>
@@ -34,7 +34,7 @@
     </td>
   </tr>
   <tr>
-    <td colspan="3"><input type="submit" name="seedUploadRetry" value="Retry Uploading" /></td>
+    <td colspan="3"><input type="submit" name="seedUploadRetry" class="btn btn-primary" value="Retry Uploading" /></td>
   </tr>
 </table>
 </form>
diff --git a/htroot/Settings_Seed_UploadFile.inc b/htroot/Settings_Seed_UploadFile.inc
index 6350408b1..5079fdf9a 100644
--- a/htroot/Settings_Seed_UploadFile.inc
+++ b/htroot/Settings_Seed_UploadFile.inc
@@ -5,11 +5,11 @@
 <table border="0" cellspacing="5">
   <tr valign="top">
     <td><label for="fs_path">File Location</label>:</td>
-    <td><input name="seedFilePath" type="text" id="fs_path" size="40" value="#[seedFilePath]#" /></td>
+    <td><input name="seedFilePath" type="file" id="fs_path" size="40" value="#[seedFilePath]#" /></td>
     <td><i>Here you can specify the path within the filesystem where the seed-list file should be stored.</i></td>
   </tr>  
   <tr>
-    <td colspan="3"><input type="submit" name="seedFileSettings" value="Submit" /></td>
+    <td colspan="3"><input type="submit" name="seedFileSettings" class="btn btn-primary" value="Submit" /></td>
   </tr>  
 </table>
 </form>
diff --git a/htroot/Settings_Seed_UploadFtp.inc b/htroot/Settings_Seed_UploadFtp.inc
index 0d01201a7..3261f7cef 100644
--- a/htroot/Settings_Seed_UploadFtp.inc
+++ b/htroot/Settings_Seed_UploadFtp.inc
@@ -31,7 +31,7 @@
     <td><i>The password</i></td>
   </tr>
   <tr>
-    <td colspan="3"><input type="submit" name="seedFtpSettings" value="Submit" /></td>
+    <td colspan="3"><input type="submit" name="seedFtpSettings" class="btn btn-primary" value="Submit" /></td>
   </tr>
 </table>
 </form>
diff --git a/htroot/Settings_Seed_UploadScp.inc b/htroot/Settings_Seed_UploadScp.inc
index c0945f817..fd0cea50f 100644
--- a/htroot/Settings_Seed_UploadScp.inc
+++ b/htroot/Settings_Seed_UploadScp.inc
@@ -31,7 +31,7 @@
     <td><i>The password</i></td>
   </tr>
   <tr>
-    <td colspan="3"><input type="submit" name="seedScpSettings" value="Submit" /></td>
+    <td colspan="3"><input type="submit" name="seedScpSettings" class="btn btn-primary" value="Submit" /></td>
   </tr>
 </table>
 </form>
diff --git a/htroot/Settings_ServerAccess.inc b/htroot/Settings_ServerAccess.inc
index a002ba2d5..a9476e8bb 100644
--- a/htroot/Settings_ServerAccess.inc
+++ b/htroot/Settings_ServerAccess.inc
@@ -55,7 +55,7 @@
 			for the preconfigured value 'localpeer', the URL is: http://localpeer/.</td>
   </tr>
   <tr valign="top">
-    <td colspan="3"><input type="submit" name="serveraccount" value="Submit" /></td>
+    <td colspan="3"><input type="submit" name="serveraccount" class="btn btn-primary" value="Submit" /></td>
   </tr>
 </table>
 </fieldset>
diff --git a/htroot/Status.html b/htroot/Status.html
index 713d0500f..1bba59a75 100644
--- a/htroot/Status.html
+++ b/htroot/Status.html
@@ -127,11 +127,7 @@
     <dd class="hint">Latest public version is v#[latestVersion]#.
       You can download a more recent version of YaCy. Click here to install this update and restart YaCy: 
       <form action="Status.html" method="get" class="PeerControl" accept-charset="UTF-8">
-
-<!-- Is this line here on purpose or by accident?
-      <form action="Table_API_p.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8" name="apilist">
--->
-        <button type="submit" name="aquirerelease" value="Update YaCy">
+        <button type="submit" name="aquirerelease" class="btn btn-primary" value="Update YaCy">
           <img src="env/grafics/lock.gif" alt="lock icon"/>
           Install YaCy v#[latestVersion]#
         </button>
diff --git a/htroot/Surftips.html b/htroot/Surftips.html
index 1f62a70ae..0d4470bfa 100644
--- a/htroot/Surftips.html
+++ b/htroot/Surftips.html
@@ -55,11 +55,11 @@
     </p>
     
     <form action="Surftips.html" method="get" class="PeerControl" accept-charset="UTF-8"><div>
-      <button type="submit" name="publicPage" value="0">
+      <button type="submit" name="publicPage" class="btn btn-primary" value="0">
         <img src="env/grafics/lock.gif" alt="authentication required" />
           Hide surftips for users without autorization
       </button>
-      <button type="submit" name="publicPage" value="1">
+      <button type="submit" name="publicPage" class="btn btn-primary" value="1">
         <img src="env/grafics/lock.gif" alt="authentication required" />
           Show surftips to everyone
       </button>
diff --git a/htroot/Tables_p.html b/htroot/Tables_p.html
index 9efb3e585..163ebeed2 100644
--- a/htroot/Tables_p.html
+++ b/htroot/Tables_p.html
@@ -60,7 +60,7 @@ document.write("<div id=\"api\"><a href=\"/Tables_p.xml" + window.location.searc
         <dt>reverse:</dt>
         <dd><input type="checkbox" name="reverse" #(reverse)#::checked="check"#(/reverse)# onchange='this.form.submit()'></dd>
         <dt>search rows for</dt>
-        <dd><input type="text" name="search" value="#[pattern]#" /><input type="submit" name="edittable" value="Search" /></dd>
+        <dd><input type="text" name="search" value="#[pattern]#" /> <input type="submit" name="edittable" class="btn btn-default" value="Search" /></dd>
       </dl>
     </fieldset>
     </form>
@@ -90,10 +90,10 @@ document.write("<div id=\"api\"><a href=\"/Tables_p.xml" + window.location.searc
       <p>
       <input type="hidden" name="table" value="#[table]#" />
       <input type="hidden" name="num" value="#[num]#" />
-      <input type="submit" name="editrow" value="Edit Selected Row" />
-      <input type="submit" name="addrow" value="Add a new Row" />&nbsp;&nbsp;&nbsp;&nbsp;
-      <input type="submit" name="deleterows" value="Delete Selected Rows" />
-      <input type="submit" name="deletetable" value="Delete Table" />
+      <input type="submit" name="editrow" class="btn btn-primary" value="Edit Selected Row" />
+      <input type="submit" name="addrow" class="btn btn-primary" value="Add a new Row" />&nbsp;&nbsp;&nbsp;&nbsp;
+      <input type="submit" name="deleterows" class="btn btn-danger" value="Delete Selected Rows" />
+      <input type="submit" name="deletetable" class="btn btn-danger" value="Delete Table" />
       </p>
       </fieldset>
     </form>
diff --git a/htroot/Threaddump_p.html b/htroot/Threaddump_p.html
index 80e75ba49..1e20c0cfd 100644
--- a/htroot/Threaddump_p.html
+++ b/htroot/Threaddump_p.html
@@ -6,20 +6,20 @@
 	#%env/templates/metas.template%#
 </head>
 <body id="Threaddump">
-	#%env/templates/header.template%#
+	#%env/templates/header.template%#
 	#%env/templates/submenuComputation.template%#
     <h2>Threaddump</h2>
     <table border="0" cellpadding="0" cellspacing="0"><tr>
     <td><form action="Threaddump_p.html" method="get" accept-charset="UTF-8">
       <fieldset>
-        <input type="submit" name="singleThreaddump" value="Single Threaddump" />
+        <input type="submit" name="singleThreaddump" class="btn btn-primary" value="Single Threaddump" />
       </fieldset>
     </form></td>
     
     <td><form action="Threaddump_p.html" method="get" accept-charset="UTF-8">
       <fieldset>
         <input type="text" name="count" value="#[count]#" size="4" maxlength="4" />
-        <input type="submit" name="multipleThreaddump" value="Multiple Dump Statistic" />
+        <input type="submit" name="multipleThreaddump" class="btn btn-primary" value="Multiple Dump Statistic" />
       </fieldset>
     </form></td>
     </tr></table>
diff --git a/htroot/User.html b/htroot/User.html
index 6e62dabfc..42d3bf261 100644
--- a/htroot/User.html
+++ b/htroot/User.html
@@ -14,7 +14,7 @@
         <input type="hidden" name="returnto" value="#[returnto]#" />
         Username: <input type="text" name="username" value="#[username]#" /><br />
         Password: <input type="password" name="password" /><br />
-        <input type="submit" value="login" />
+        <input type="submit" class="btn btn-primary" value="login" />
       </form>
     </p>
     ::
@@ -22,7 +22,7 @@
       You are currently logged in as #[username]#.<br />
       (Identified by #(identified-by)#IP::Username/Password::Cookie#(/identified-by)#)<br />
       <form action="User.html" accept-charset="UTF-8">
-        <input type="submit" name="logout" value="logout">
+        <input type="submit" name="logout" class="btn btn-primary" value="logout">
       </form>
       #(limit)#::
       #{percent}#<img src="env/grafics/red-block.png" alt="red bar" />#{/percent}##{percent2}#<img src="env/grafics/green-block.png" alt="green bar" />#{/percent2}#
@@ -45,14 +45,14 @@
           <td><input type="password" name="newpass2" id="newpass2" /></td>
         </tr>
         <tr>
-          <td colspan="2"><input type="submit" name="changepass" value="Change" /></td>
+          <td colspan="2"><input type="submit" name="changepass" class="btn btn-primary" value="Change" /></td>
         </tr>
       </table>
     </form>
     ::
     You are currently logged in as admin.<br />
     <form action="User.html" accept-charset="UTF-8">
-      <input type="submit" name="logout" value="logout">
+      <input type="submit" name="logout" class="btn btn-primary" value="logout">
     </form>
     <br />
     <p>(after logout you will be prompted for your password again. simply click "cancel")</p>
diff --git a/htroot/ViewFile.html b/htroot/ViewFile.html
index 98e4fd533..d32cc22c4 100644
--- a/htroot/ViewFile.html
+++ b/htroot/ViewFile.html
@@ -82,15 +82,15 @@ function updatepage(str) {
           <dt>URL:</dt>
           <dd>
             <input type="text" size="60" name="url" id="url" value="#[url]#" />
-            <input type="submit" name="show" value="Show Metadata" />
-            #(moar)#::<input type="button" value="Browse Host" onClick="location.href='/HostBrowser.html?path=' + document.getElementById('url').value" />#(/moar)#
+            <input type="submit" name="show" class="btn btn-primary" value="Show Metadata" />
+            #(moar)#::<input type="button" value="Browse Host" class="btn btn-default" onClick="location.href='/HostBrowser.html?path=' + document.getElementById('url').value" />#(/moar)#
             <div id="searchresults"></div>
           </dd>
           #(moar)#::
           <dt>Search in Document:</dt>
           <dd>
             <input type="text" size="60" name="search" id="search" value="#[search]#" />
-            <input type="submit" name="show" value="Show Snippet" />
+            <input type="submit" name="show" class="btn btn-primary" value="Show Snippet" />
           </dd>
           #(/moar)#
         </dl>
@@ -124,7 +124,7 @@ function updatepage(str) {
               <option value="links"#(vMode-links)#:: selected="selected"#(/vMode-links)#>Link List</option>
               <option value="iframeCitations"#(vMode-iframeCitations)#:: selected="selected"#(/vMode-iframeCitations)#>Citation Report</option>
             </select>
-            <noscript><input type="submit" name="show" value="Show" /></noscript>
+            <noscript><input type="submit" name="show" class="btn btn-primary" value="Show" /></noscript>
           </dd>
         </dl>
         <input type="hidden" name="words" value="#[words]#" />
diff --git a/htroot/compare_yacy.html b/htroot/compare_yacy.html
index 4cd62a09b..058280796 100644
--- a/htroot/compare_yacy.html
+++ b/htroot/compare_yacy.html
@@ -19,7 +19,7 @@
     <fieldset>
         <legend>Websearch Comparison</legend>
         <form action="" method="get" accept-charset="UTF-8">
-            <p><input type="text" class="searchinput" name="query" value="#[search_query]#" size="40" onFocus="this.select()"/><input type="submit" value="Compare" />
+            <p><input type="text" class="searchinput" name="query" value="#[search_query]#" size="40" onFocus="this.select()"/> <input type="submit" class="btn btn-primary" value="Compare" />
                Left Search Engine
                    <select name="left">
                    #{searchengines}#
diff --git a/htroot/sharedBlacklist_p.html b/htroot/sharedBlacklist_p.html
index 6eff9f82b..922c614db 100644
--- a/htroot/sharedBlacklist_p.html
+++ b/htroot/sharedBlacklist_p.html
@@ -83,9 +83,9 @@
         </tr>#{/urllist}#
         <tr class="small" style="background-color: #eeeeee">
           <td colspan="2">
-            <input type="button" onclick="selectall(this.form.name)" value="select all" />
-            <input type="button" onclick="deselectall(this.form.name)" value="deselect all" />
-            <input type="submit" value="add" name="add" />
+            <input type="button" class="btn btn-primary" onclick="selectall(this.form.name)" value="select all" />
+            <input type="button" class="btn btn-primary" onclick="deselectall(this.form.name)" value="deselect all" />
+            <input type="submit" class="btn btn-primary" value="add" name="add" />
           </td>
         </tr>
       </table>