diff --git a/htroot/AugmentedBrowsing_p.html b/htroot/AugmentedBrowsing_p.html
index 32efd617b..cf6a45c7a 100644
--- a/htroot/AugmentedBrowsing_p.html
+++ b/htroot/AugmentedBrowsing_p.html
@@ -54,10 +54,9 @@
                   Define URL substitution rules which allow navigating in proxy environment. Possible values: all, domainlist. Default: domainlist.
                 </p>
               </dd>
-
+              
             </dl>
-
-    <input type="submit" name="urlproxySettings" value="Submit" class="btn btn-primary"/>
+  <dl><dt></dt><dd><input type="submit" name="urlproxySettings" value="Submit" class="btn btn-primary"/></dd></dl>
 </fieldset>
 </form>
     
diff --git a/htroot/ContentAnalysis_p.html b/htroot/ContentAnalysis_p.html
index 8296157f7..b69fa680f 100644
--- a/htroot/ContentAnalysis_p.html
+++ b/htroot/ContentAnalysis_p.html
@@ -28,8 +28,8 @@
           </dd>
           <dt style="width:260px"></dt>
           <dd style="width:360px; float:left; display:inline;">
-            <input type="submit" name="EnterDoublecheck" value="Set" />
-            <input type="submit" name="ResetDoublecheck" value="Re-Set to default" />
+            <input type="submit" name="EnterDoublecheck" class="btn btn-primary" value="Set" />
+            <input type="submit" name="ResetDoublecheck" class="btn btn-primary" value="Re-Set to default" />
           </dd>
         </dl>
       </fieldset>
diff --git a/htroot/DictionaryLoader_p.html b/htroot/DictionaryLoader_p.html
index 364c56a65..95446429b 100644
--- a/htroot/DictionaryLoader_p.html
+++ b/htroot/DictionaryLoader_p.html
@@ -34,11 +34,11 @@
           <dd>#(geon0Status)#<div class="info">not loaded</div>::<div class="commit">loaded</div>::deactivated#(/geon0Status)#</dd>
           <dt>Action</dt>
           <dd>#(geon0Status)#
-          <input type="submit" name="geon0Load" value="Load" />::
-          <input type="submit" name="geon0Deactivate" value="Deactivate" />
-          <input type="submit" name="geon0Remove" value="Remove" />::
-          <input type="submit" name="geon0Activate" value="Activate" />
-          <input type="submit" name="geon0Remove" value="Remove" />
+          <input type="submit" name="geon0Load" class="btn btn-sm btn-primary" value="Load" />::
+          <input type="submit" name="geon0Deactivate" class="btn btn-sm btn-primary" value="Deactivate" />
+          <input type="submit" name="geon0Remove" class="btn btn-sm btn-danger" value="Remove" />::
+          <input type="submit" name="geon0Activate" class="btn btn-sm btn-primary" value="Activate" />
+          <input type="submit" name="geon0Remove" class="btn btn-sm btn-danger" value="Remove" />
           #(/geon0Status)#</dd>
           #(geon0ActionLoaded)#::
           <dt>Result</dt><dd><div class="commit">loaded and activated dictionary file</div></dd>::
@@ -68,11 +68,11 @@
           <dd>#(geon1Status)#<div class="info">not loaded</div>::<div class="commit">loaded</div>::deactivated#(/geon1Status)#</dd>
           <dt>Action</dt>
           <dd>#(geon1Status)#
-          <input type="submit" name="geon1Load" value="Load" />::
-          <input type="submit" name="geon1Deactivate" value="Deactivate" />
-          <input type="submit" name="geon1Remove" value="Remove" />::
-          <input type="submit" name="geon1Activate" value="Activate" />
-          <input type="submit" name="geon1Remove" value="Remove" />
+          <input type="submit" name="geon1Load" class="btn btn-sm btn-primary" value="Load" />::
+          <input type="submit" name="geon1Deactivate" class="btn btn-sm btn-primary" value="Deactivate" />
+          <input type="submit" name="geon1Remove" class="btn btn-sm btn-danger" value="Remove" />::
+          <input type="submit" name="geon1Activate" class="btn btn-sm btn-primary" value="Activate" />
+          <input type="submit" name="geon1Remove" class="btn btn-sm btn-danger" value="Remove" />
           #(/geon1Status)#</dd>
           #(geon1ActionLoaded)#::
           <dt>Result</dt><dd><div class="commit">loaded and activated dictionary file</div></dd>::
@@ -102,11 +102,11 @@
           <dd>#(geon2Status)#<div class="info">not loaded</div>::<div class="commit">loaded</div>::deactivated#(/geon2Status)#</dd>
           <dt>Action</dt>
           <dd>#(geon2Status)#
-          <input type="submit" name="geon2Load" value="Load" />::
-          <input type="submit" name="geon2Deactivate" value="Deactivate" />
-          <input type="submit" name="geon2Remove" value="Remove" />::
-          <input type="submit" name="geon2Activate" value="Activate" />
-          <input type="submit" name="geon2Remove" value="Remove" />
+          <input type="submit" name="geon2Load" class="btn btn-sm btn-primary" value="Load" />::
+          <input type="submit" name="geon2Deactivate" class="btn btn-sm btn-primary" value="Deactivate" />
+          <input type="submit" name="geon2Remove" class="btn btn-sm btn-danger" value="Remove" />::
+          <input type="submit" name="geon2Activate" class="btn btn-sm btn-primary" value="Activate" />
+          <input type="submit" name="geon2Remove" class="btn btn-sm btn-danger" value="Remove" />
           #(/geon2Status)#</dd>
           #(geon2ActionLoaded)#::
           <dt>Result</dt><dd><div class="commit">loaded and activated dictionary file</div></dd>::
@@ -138,11 +138,11 @@
           <dd>#(geo1Status)#<div class="info">not loaded</div>::<div class="commit">loaded</div>::deactivated#(/geo1Status)#</dd>
           <dt>Action</dt>
           <dd>#(geo1Status)#
-          <input type="submit" name="geo1Load" value="Load" />::
-          <input type="submit" name="geo1Deactivate" value="Deactivate" />
-          <input type="submit" name="geo1Remove" value="Remove" />::
-          <input type="submit" name="geo1Activate" value="Activate" />
-          <input type="submit" name="geo1Remove" value="Remove" />
+          <input type="submit" name="geo1Load" class="btn btn-sm btn-primary" value="Load" />::
+          <input type="submit" name="geo1Deactivate" class="btn btn-sm btn-primary" value="Deactivate" />
+          <input type="submit" name="geo1Remove" class="btn btn-sm btn-danger" value="Remove" />::
+          <input type="submit" name="geo1Activate" class="btn btn-sm btn-primary" value="Activate" />
+          <input type="submit" name="geo1Remove" class="btn btn-sm btn-danger" value="Remove" />
           #(/geo1Status)#</dd>
           #(geo1ActionLoaded)#::
           <dt>Result</dt><dd><div class="commit">loaded and activated dictionary file</div></dd>::
@@ -181,11 +181,11 @@
           <dd>#(drw0Status)#<div class="info">not loaded</div>::<div class="commit">loaded</div>::deactivated#(/drw0Status)#</dd>
           <dt>Action</dt>
           <dd>#(drw0Status)#
-          <input type="submit" name="drw0Load" value="Load" />::
-          <input type="submit" name="drw0Deactivate" value="Deactivate" />
-          <input type="submit" name="drw0Remove" value="Remove" />::
-          <input type="submit" name="drw0Activate" value="Activate" />
-          <input type="submit" name="drw0Remove" value="Remove" />
+          <input type="submit" name="drw0Load" class="btn btn-sm btn-primary" value="Load" />::
+          <input type="submit" name="drw0Deactivate" class="btn btn-sm btn-primary" value="Deactivate" />
+          <input type="submit" name="drw0Remove" class="btn btn-sm btn-danger" value="Remove" />::
+          <input type="submit" name="drw0Activate" class="btn btn-sm btn-primary" value="Activate" />
+          <input type="submit" name="drw0Remove" class="btn btn-sm btn-danger" value="Remove" />
           #(/drw0Status)#</dd>
           #(drw0ActionLoaded)#::
           <dt>Result</dt><dd><div class="commit">loaded and activated dictionary file</div></dd>::
@@ -219,7 +219,7 @@
           <dt><label>Status</label></dt>
           <dd>#(syn0Status)#<div class="info">Deactivated</div>::<div class="commit">Activated</div>#(/syn0Status)#</dd> 
           <dt>Action</dt>
-          <dd>#(syn0Status)#<input type="submit" name="syn0Activate" value="Activate" />::<input type="submit" name="syn0Deactivate" value="Deactivate" />#(/syn0Status)#</dd> 
+          <dd>#(syn0Status)#<input type="submit" name="syn0Activate" class="btn btn-sm btn-primary" value="Activate" />::<input type="submit" name="syn0Deactivate" class="btn btn-sm btn-primary" value="Deactivate" />#(/syn0Status)#</dd> 
         </dl>
         
         <h4><a href="http://icon.shef.ac.uk/Moby/" target="_blank">Moby Lexicon - English Thesaurus from http://icon.shef.ac.uk/Moby/</a></h4>
@@ -229,7 +229,7 @@
           <dt><label>Status</label></dt>
           <dd>#(syn1Status)#<div class="info">Deactivated</div>::<div class="commit">Activated</div>#(/syn1Status)#</dd> 
           <dt>Action</dt>
-          <dd>#(syn1Status)#<input type="submit" name="syn1Activate" value="Activate" />::<input type="submit" name="syn1Deactivate" value="Deactivate" />#(/syn1Status)#</dd> 
+          <dd>#(syn1Status)#<input type="submit" name="syn1Activate" class="btn btn-sm btn-primary" value="Activate" />::<input type="submit" name="syn1Deactivate" class="btn btn-sm btn-primary" value="Deactivate" />#(/syn1Status)#</dd> 
         </dl>
       </fieldset>
     </form>
diff --git a/htroot/IndexCreateParserErrors_p.html b/htroot/IndexCreateParserErrors_p.html
index b34d1cf7d..e334f99dc 100644
--- a/htroot/IndexCreateParserErrors_p.html
+++ b/htroot/IndexCreateParserErrors_p.html
@@ -19,9 +19,9 @@
       <p>Showing latest #[num]# entries.</p>
       <fieldset>
         <input type="hidden" name="showRejected" value="#[newnum]#" />
-        <input type="submit" name="moreRejected" value="show more" />&nbsp;
+        <input type="submit" name="moreRejected" class="btn btn-success" value="show more" />&nbsp;
       #(/only-latest)#
-        <input type="submit" name="clearRejected" value="clear list" />
+        <input type="submit" name="clearRejected" class="btn btn-danger" value="clear list" />
       </fieldset>
     </form>
     <p>There are #[num]# entries in the rejected-queue:</p>
diff --git a/htroot/IndexFederated_p.html b/htroot/IndexFederated_p.html
index 336383e20..95dc1e1f7 100644
--- a/htroot/IndexFederated_p.html
+++ b/htroot/IndexFederated_p.html
@@ -74,7 +74,7 @@
       <dt class="TableCellDark"></dt>
       <dd><input type="checkbox" name="solr.indexing.solrremote.writeenabled" id="solr_indexing_solrremote_writeenabled" #(solr.indexing.solrremote.writeenabled.checked)#:: checked="checked"#(/solr.indexing.solrremote.writeenabled.checked)#/> write-enabled (if unchecked, the remote server(s) will only be used as search peers)</dd>
 
-      <dt><input type="submit" name="setsolr" value="Set" /></dt><dd></dd>
+      <dt><input type="submit" name="setsolr" class="btn btn-primary" value="Set" /></dt><dd></dd>
 
       </dd>
       </dl>
@@ -95,7 +95,7 @@
       <dt><input type="checkbox" name="core.service.webgraph.tmp" id="core_service_webgraph" #(core.service.webgraph.tmp.checked)#:: checked="checked"#(/core.service.webgraph.tmp.checked)# /></dt>
       <dd>use webgraph search index (rich information in second Solr core)</dd>
       
-      <dt><input type="submit" name="setcitation" value="Set" /></dt><dd></dd>
+      <dt><input type="submit" name="setcitation" class="btn btn-primary" value="Set" /></dt><dd></dd>
       </dl>
       </fieldset>
     </form>
@@ -111,7 +111,7 @@
       <dt><input type="checkbox" name="core.service.rwi" id="core_service_rwi" #(core.service.rwi.checked)#:: checked="checked"#(/core.service.rwi.checked)# /></dt>
       <dd>support peer-to-peer index transmission (DHT RWI index)</dd>
       
-      <dt><input type="submit" name="setrwi" value="Set" /></dt><dd></dd>
+      <dt><input type="submit" name="setrwi" class="btn btn-primary" value="Set" /></dt><dd></dd>
       </dl>
       </fieldset>
     </form>
diff --git a/htroot/IndexSchema_p.html b/htroot/IndexSchema_p.html
index cc0a2ae7b..b47c920de 100644
--- a/htroot/IndexSchema_p.html
+++ b/htroot/IndexSchema_p.html
@@ -54,8 +54,8 @@
       </div>
     </fieldset>
       <div>
-        <input type="submit" name="set" value="Set" />
-        <input style="float:right" type="submit" name="resetselectiontodefault" value="reset selection to default" />
+        <input type="submit" name="set" class="btn btn-primary" value="Set" />
+        <input style="float:right" type="submit" name="resetselectiontodefault" class="btn btn-primary" value="reset selection to default" />
       </div>
     </form>
     <p><br /></p>
@@ -66,7 +66,7 @@
              To physically remove them from the index you need to reindex the documents.
              Here you can reindex all documents with inactive fields.</p>
         <div style="text-align:center ">
-          <input type="submit" name="reindexSolr" value="reindex Solr" />  
+          <input type="submit" name="reindexSolr" class="btn btn-primary" value="reindex Solr" />  
           <input type="hidden" name="reindexnow"/>
         </div>    
         <p>You may monitor progress (or stop the job) under <a href="IndexReIndexMonitor_p.html">IndexReIndexMonitor_p.html</a></p> 
diff --git a/htroot/Load_MediawikiWiki.html b/htroot/Load_MediawikiWiki.html
index 50a309958..00b0a8a63 100644
--- a/htroot/Load_MediawikiWiki.html
+++ b/htroot/Load_MediawikiWiki.html
@@ -30,10 +30,10 @@
           <input type="hidden" name="crawlingMode" id="url" value="url" checked="checked" />
           <input type="hidden" name="createBookmark" value="off" />		  
           <input type="hidden" name="crawlingDepth" value="8" />
-		  <input type="hidden" name="mustmatch" value=".*" />
-		  <input type="hidden" name="mustnotmatch" value="(.*Recentchangeslinked.*)|(.*Whatlinkshere.*)|(.*MediaWiki.*)" />
-		  <input type="hidden" name="range" value="subpath" />
-		  <input type="hidden" name="crawlingIfOlderCheck" value="on"/>
+	  <input type="hidden" name="mustmatch" value=".*" />
+	  <input type="hidden" name="mustnotmatch" value="(.*Recentchangeslinked.*)|(.*Whatlinkshere.*)|(.*MediaWiki.*)" />
+	  <input type="hidden" name="range" value="subpath" />
+	  <input type="hidden" name="crawlingIfOlderCheck" value="on"/>
           <input type="hidden" name="crawlingIfOlderNumber" value="1" />
           <input type="hidden" name="crawlingIfOlderUnit" value="day" />
           <input type="hidden" name="crawlingDomFilterCheck" value="off" />
@@ -51,7 +51,7 @@
           <input type="hidden" name="xpstopw" value="off" />
           </dd>
           <dt>&nbsp;</dt>
-          <dd><input type="submit" name="crawlingstart" value="Get content of Wiki: crawl wiki pages" /></dd>
+          <dd><input type="submit" name="crawlingstart" class="btn btn-primary" value="Get content of Wiki: crawl wiki pages" /></dd>
           
         </dl>
       </fieldset>
diff --git a/htroot/Load_PHPBB3.html b/htroot/Load_PHPBB3.html
index 297f61e6f..cf61e5878 100644
--- a/htroot/Load_PHPBB3.html
+++ b/htroot/Load_PHPBB3.html
@@ -35,7 +35,7 @@
           <dd><input type="text" name="crawlingURL" value="#[starturl]#" size="60" maxlength="256" onkeypress="changed()" onfocus="check('url')" /></dd>
 
           <dt>&nbsp;</dt>
-          <dd><input type="submit" name="crawlingstart" value="Get content of phpBB3: crawl forum pages" /></dd>
+          <dd><input type="submit" name="crawlingstart" class="btn btn-primary" value="Get content of phpBB3: crawl forum pages" /></dd>
           
         </dl>
            
diff --git a/htroot/PerformanceQueues_p.html b/htroot/PerformanceQueues_p.html
index 379ca9f2a..d438097fe 100644
--- a/htroot/PerformanceQueues_p.html
+++ b/htroot/PerformanceQueues_p.html
@@ -60,8 +60,8 @@
 	      #{/table}#
 	      <tr class="TableCellLight">
 	        <td align="left" colspan="19">
-	          <input type="submit" name="submitdelay" value="Submit New Delay Values" />
-	          <input type="submit" name="submitdefault" value="Re-set to default" />
+                  <input type="submit" name="submitdelay" class="btn btn-sm btn-primary" value="Submit New Delay Values" />
+	          <input type="submit" name="submitdefault" class="btn btn-sm btn-primary" value="Re-set to default" />
 	          Changes take effect immediately<br/>
 	        </td>
 	      </tr>
@@ -121,7 +121,7 @@
 	      </tr>
 	      <tr valign="top" class="TableCellLight">
 	        <td colspan="4">
-	        <input type="submit" name="cacheSizeSubmit" value="Enter New Cache Size" />
+	        <input type="submit" name="cacheSizeSubmit" class="btn btn-sm btn-primary" value="Enter New Cache Size" />
 	        Changes take effect immediately</td>
 	      </tr>
 	    </table>
@@ -145,7 +145,7 @@
 	      #{/pool}#
 	      <tr class="TableCellLight">
 	        <td align="left" colspan="7">
-	        <input type="submit" name="poolConfig" value="Enter new Threadpool Configuration" />
+	        <input type="submit" name="poolConfig" class="btn btn-sm btn-primary" value="Enter new Threadpool Configuration" />
 	        Changes take effect immediately</td>
 	      </tr>
 	    </table>
diff --git a/htroot/ProxyIndexingMonitor_p.html b/htroot/ProxyIndexingMonitor_p.html
index e44062e41..ba6b6d8f4 100644
--- a/htroot/ProxyIndexingMonitor_p.html
+++ b/htroot/ProxyIndexingMonitor_p.html
@@ -95,7 +95,7 @@
       
         <tr valign="top" class="TableCellDark">
           <td colspan="1">&nbsp;</td>
-          <td colspan="2"><input type="submit" name="proxyprofileset" value="Set proxy profile" /></td>
+          <td colspan="2"><input type="submit" name="proxyprofileset" class="btn btn-primary" value="Set proxy profile" /></td>
         </tr>
       </table>
     </form>
diff --git a/htroot/RankingSolr_p.html b/htroot/RankingSolr_p.html
index 8ac304321..169a35d54 100644
--- a/htroot/RankingSolr_p.html
+++ b/htroot/RankingSolr_p.html
@@ -33,8 +33,8 @@
           </dd>
           <dt style="width:260px;margin:0;padding:0;height:1.8em;"></dt>
           <dd style="width:360px;margin:0;padding:0;height:1.8em;float:left;display:inline;">
-            <input type="submit" name="EnterBF" value="Set Boost Function" />
-            <input type="submit" name="ResetBF" value="Re-Set to default" />
+            <input type="submit" name="EnterBF" class="btn btn-primary" value="Set Boost Function" />
+            <input type="submit" name="ResetBF" class="btn btn-primary" value="Re-Set to default" />
           </dd>
         </dl><br/>
         #(boosthint)#::You can boost with vocabularies, use the occurrence counters #[vocabulariesvoccount]# and #[vocabulariesvoclogcount]#.#(/boosthint)#
@@ -54,8 +54,8 @@
           </dd>
           <dt style="width:260px;margin:0;padding:0;height:1.8em;"></dt>
           <dd style="width:360px;margin:0;padding:0;height:1.8em;float:left;display:inline;">
-            <input type="submit" name="EnterBQ" value="Set Boost Query" />
-            <input type="submit" name="ResetBQ" value="Re-Set to default" />
+            <input type="submit" name="EnterBQ" class="btn btn-primary" value="Set Boost Query" />
+            <input type="submit" name="ResetBQ" class="btn btn-primary" value="Re-Set to default" />
           </dd>
         </dl><br/>
         #(boosthint)#::
@@ -91,8 +91,8 @@
           </dd>
           <dt style="width:260px;margin:0;padding:0;height:1.8em;"></dt>
           <dd style="width:360px;margin:0;padding:0;height:1.8em;float:left;display:inline;">
-            <input type="submit" name="EnterFQ" value="Set Filter Query" />
-            <input type="submit" name="ResetFQ" value="Re-Set to default" />
+            <input type="submit" name="EnterFQ" class="btn btn-primary" value="Set Filter Query" />
+            <input type="submit" name="ResetFQ" class="btn btn-primary" value="Re-Set to default" />
           </dd>
         </dl>
       </fieldset>
@@ -113,8 +113,8 @@
           </dd>#{/boosts}#
           <dt style="width:260px;margin:0;padding:0;height:1.8em;"></dt>
           <dd style="width:360px;margin:0;padding:0;height:1.8em;float:left;display:inline;">
-            <input type="submit" name="EnterBoosts" value="Set Field Boosts" />
-            <input type="submit" name="ResetBoosts" value="Re-Set to default" />
+            <input type="submit" name="EnterBoosts" class="btn btn-primary" value="Set Field Boosts" />
+            <input type="submit" name="ResetBoosts" class="btn btn-primary" value="Re-Set to default" />
           </dd>
         </dl>
       </fieldset>
diff --git a/htroot/WatchWebStructure_p.html b/htroot/WatchWebStructure_p.html
index 3014a750b..74a4d7924 100644
--- a/htroot/WatchWebStructure_p.html
+++ b/htroot/WatchWebStructure_p.html
@@ -106,7 +106,7 @@ To see a list of all APIs, please visit the <a href="http://www.yacy-websuche.de
     <dt>Other Dot</dt><dd>Color <input type="text" name="colordota" id="colordota" value="#[colordota]#" size="6" maxlength="6" /></dd>
     <dt>Dot-end</dt><dd>Color <input type="text" name="colorlineend" id="colorlineend" value="#[colorlineend]#" size="6" maxlength="6" /></dd>
     </dl>
-    <div align="center"><input type="submit" value="change" /></div>
+    <div align="center"><input type="submit" class="btn btn-primary" value="change" /></div>
   
 </fieldset>
 </form>