diff --git a/htroot/ConfigAccounts_p.html b/htroot/ConfigAccounts_p.html
index d2a390638..92663a399 100644
--- a/htroot/ConfigAccounts_p.html
+++ b/htroot/ConfigAccounts_p.html
@@ -50,7 +50,7 @@
               <dt><label for="adminpw2">Repeat Peer Password:</label></dt>
               <dd><input type="password" name="adminpw2" id="adminpw2" value="" size="16" maxlength="1024" onFocus="document.getElementById('access_account').checked = true;"/></dd>
               <dt></dt>
-              <dd><input type="submit" name="setAdmin" value="Define Administrator" class="submitready"/></dd>
+              <dd><input type="submit" name="setAdmin" value="Define Administrator" class="btn btn-primary"/></dd>
             </dl>
           </fieldset>
       </form>
@@ -65,7 +65,7 @@
               $("[name='adminAccountAllPages']").bootstrapSwitch('onText', 'ON');
               $("[name='adminAccountAllPages']").bootstrapSwitch('offText', 'OFF');</script>
 			  <dt></dt>
-              <dd><input type="submit" name="setAccess" value="Set Access Rules" class="submitready"/></dd>
+              <dd><input type="submit" name="setAccess" value="Set Access Rules" class="btn btn-primary"/></dd>
             </dl>
       </form>
     </fieldset>
@@ -83,8 +83,8 @@
           </dd>
           <dt>&nbsp;</dt>
           <dd>
-            <input type="submit" name="change_user" value="Edit User" class="submitready"/>
-            <input type="submit" name="delete_user" value="Delete User" class="submitready"/>
+            <input type="submit" name="change_user" value="Edit User" class="btn btn-primary"/>
+            <input type="submit" name="delete_user" value="Delete User" class="btn btn-primary"/>
           </dd>
         </dl>
       </fieldset>
@@ -118,7 +118,7 @@
           <dt><label for="tused">Time used</label>:</dt>
           <dd><input type="text" id="tused" name="timeused" value="#[timeused]#" /></dd>
           <dt>&nbsp;</dt>
-          <dd><input type="submit" name="change" value="Save User" class="submitready"/></dd>
+          <dd><input type="submit" name="change" value="Save User" class="btn btn-primary"/></dd>
         </dl>
       </fieldset>
     </form>
diff --git a/htroot/ConfigAppearance_p.html b/htroot/ConfigAppearance_p.html
index 2c41590d3..0577bfbec 100644
--- a/htroot/ConfigAppearance_p.html
+++ b/htroot/ConfigAppearance_p.html
@@ -51,8 +51,8 @@
           </dd>
           <dt>&nbsp;</dt>
           <dd>
-            <input type="submit" name="use_button" value="Use" class="submitready"/>
-            <input type="submit" name="delete_button" value="Delete" class="submitready"/>
+            <input type="submit" name="use_button" value="Use" class="btn btn-primary"/>
+            <input type="submit" name="delete_button" value="Delete" class="btn btn-primary"/>
           </dd>
         </dl>
       </fieldset>
@@ -74,7 +74,7 @@
           <dt>&nbsp;</dt>
           <dd>
             <input type="hidden" name="skin" value="generic_pd.css" />
-            <input type="submit" name="set_colors" value="Set Colors" class="submitready"/>
+            <input type="submit" name="set_colors" value="Set Colors" class="btn btn-primary"/>
           </dd>
         </dl>
         </td><td style="width:500px;" valign="top">
@@ -102,7 +102,7 @@
           <dt><label for="use_url">Use this skin</label></dt>
           <dd><input type="checkbox" name="use_skin" id="use_url" value="on" checked="checked" /></dd>
           <dt>&nbsp;</dt>
-          <dd><input type="submit" name="install_button" value="Install" class="submitready"/></dd>
+          <dd><input type="submit" name="install_button" value="Install" class="btn btn-primary"/></dd>
         </dl>
         <p>Make sure that you only download data from trustworthy sources. The new Skin file
            might overwrite existing data if a file of the same name exists already.</p>
diff --git a/htroot/ConfigBasic.html b/htroot/ConfigBasic.html
index 5f9557d4a..49c98877d 100644
--- a/htroot/ConfigBasic.html
+++ b/htroot/ConfigBasic.html
@@ -105,7 +105,7 @@
              </dl>
            </fieldset>
          </li>
-    <fieldset>&nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" name="set" value="Set Configuration" class="submitready"/></fieldset>
+    <fieldset>&nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" name="set" value="Set Configuration" class="btn btn-primary"/></fieldset>
         
       </ol>
     </form>
diff --git a/htroot/ConfigHTCache_p.html b/htroot/ConfigHTCache_p.html
index 890ae9845..46f78f050 100644
--- a/htroot/ConfigHTCache_p.html
+++ b/htroot/ConfigHTCache_p.html
@@ -23,7 +23,7 @@
           <dt><label for="maxCacheSize">The maximum size of the cache</label></dt>
           <dd><input name="maxCacheSize" id="maxCacheSize" type="text" size="8" maxlength="24" value="#[maxCacheSize]#" /> MB</dd>
           <dt>&nbsp;</dt>
-          <dd><input type="submit" name="set" value="Set" class="submitready"/></dd>
+          <dd><input type="submit" name="set" value="Set" class="btn btn-primary"/></dd>
         </dl>
       </fieldset>
     </form>
@@ -37,7 +37,7 @@
             />Delete HTTP &amp; FTP Cache<br/>
             <input type="checkbox" name="deleteRobots" id="deleteRobots" disabled="disabled" />Delete robots.txt Cache<br/>
             <input type="checkbox" name="deleteSearchFl" id="deleteSearchFl" disabled="disabled" />Delete cached snippet-fetching failures during search<br/><br/><br/>
-            <input type="submit" name="deletecomplete" value="Delete" class="submitready"/>
+            <input type="submit" name="deletecomplete" value="Delete" class="btn btn-primary"/>
         </dd>
       </dl>
     </fieldset>
diff --git a/htroot/ConfigHeuristics_p.html b/htroot/ConfigHeuristics_p.html
index e14894b3e..4f18b5910 100644
--- a/htroot/ConfigHeuristics_p.html
+++ b/htroot/ConfigHeuristics_p.html
@@ -112,8 +112,8 @@
         <td><input type="submit" name="addnewosd" value="add"/></td>
       </tr>
       <tr>
-        <td colspan="3" style="padding-top:10px "><input type="submit" name="setopensearch" value="Save" class="submitready"/></td>
-        <td colspan="2" align="center" style="padding-top:10px "><input type="submit" name="resettodefaultosdlist" value="reset to default list" class="submitready"/></td>
+        <td colspan="3" style="padding-top:10px "><input type="submit" name="setopensearch" value="Save" class="btn btn-primary"/></td>
+        <td colspan="2" align="center" style="padding-top:10px "><input type="submit" name="resettodefaultosdlist" value="reset to default list" class="btn btn-primary"/></td>
       </tr>
       </table>
       </div>
@@ -123,13 +123,13 @@
       <br>
       <div>
         <div style="float:right">
-        <input type="submit" name="discoverosd" id="discoverosd" value="discover from index" class="submitready" onclick="return confirm('start background task, depending on index size this may run a long time')"/>
+        <input type="submit" name="discoverosd" id="discoverosd" value="discover from index" class="btn btn-primary" onclick="return confirm('start background task, depending on index size this may run a long time')"/>
         </div>
         With the button "discover from index" you can search within the metadata of your local index (Web Structure Index) to find systems which support the Opensearch specification.
         The task is started in the background. It may take some minutes before new entries appear (after refreshing the page).
         Alternatively you may <a href="?copydefaultosdconfig=">copy &amp; paste a example config file</a> located in <i>defaults/heuristicopensearch.conf</i> to the DATA/SETTINGS directory.
         For the discover function the <i>web graph</i> option of the web structure index and the fields <i>target_rel_s, target_protocol_s, target_urlstub_s</i> have to be switched on in the <a href="IndexSchema_p.html?core=webgraph">webgraph Solr schema</a>.
-        #{osdsolrfieldswitch}#<input type="submit" name="switchsolrfieldson" value="switch Solr fields on" class="submitready" onclick="return confirm('modify Solr Schema')"/>#{/osdsolrfieldswitch}#
+        #{osdsolrfieldswitch}#<input type="submit" name="switchsolrfieldson" value="switch Solr fields on" class="btn btn-primary" onclick="return confirm('modify Solr Schema')"/>#{/osdsolrfieldswitch}#
       </div>
     </form>
     </fieldset>
diff --git a/htroot/ConfigLanguage_p.html b/htroot/ConfigLanguage_p.html
index 9493dcb07..3f0ee0c3d 100644
--- a/htroot/ConfigLanguage_p.html
+++ b/htroot/ConfigLanguage_p.html
@@ -31,8 +31,8 @@
           </dd>
           <dt></dt>
           <dd>
-            <input type="submit" name="use_button" value="Use" class="submitready"/>
-            <input type="submit" name="delete" value="Delete" class="submitready"/>
+            <input type="submit" name="use_button" value="Use" class="btn btn-primary"/>
+            <input type="submit" name="delete" value="Delete" class="btn btn-primary"/>
           </dd>
         </dl>
       </fieldset>
@@ -51,7 +51,7 @@
             <input type="checkbox" name="use_lang" id="use_lang" value="on" checked="checked" />
           </dd>
           <dt></dt>
-          <dd><input type="submit" value="Install" class="submitready"/></dd>
+          <dd><input type="submit" value="Install" class="btn btn-primary"/></dd>
         </dl>
         <p>Make sure that you only download data from trustworthy sources. The new language file
            might overwrite existing data if a file of the same name exists already.</p>
diff --git a/htroot/ConfigNetwork_p.html b/htroot/ConfigNetwork_p.html
index 364ea7eb3..5a10d96e8 100644
--- a/htroot/ConfigNetwork_p.html
+++ b/htroot/ConfigNetwork_p.html
@@ -85,7 +85,7 @@
         <dt>DHT</dt>
         <dd>#[network.unit.dht]#</dd>
         <dt>&nbsp;</dt>
-        <dd><input type="submit" name="changeNetwork" value="Change Network" class="submitready"/></dd>
+        <dd><input type="submit" name="changeNetwork" value="Change Network" class="btn btn-primary"/></dd>
       </dl>
     </fieldset>
     </form>
@@ -156,7 +156,7 @@
         </dd>
         <dt></dt>
         <dd>
-          <input type="submit" name="save" value="Save" class="submitready"/>
+          <input type="submit" name="save" value="Save" class="btn btn-primary"/>
         </dd>
       </dl>
     </fieldset>
@@ -210,7 +210,7 @@
         </dd>
         <dt></dt>
         <dd>
-          <input type="submit" name="save" value="Save" class="submitready"/>
+          <input type="submit" name="save" value="Save" class="btn btn-primary"/>
         </dd>
       </dl>
 	</fieldset>
diff --git a/htroot/ConfigParser.html b/htroot/ConfigParser.html
index ba77ce9fd..f19613736 100644
--- a/htroot/ConfigParser.html
+++ b/htroot/ConfigParser.html
@@ -47,7 +47,7 @@
   </tr>#{/mime}#
   #{/parser}#
   <tr class="TableCellDark">
-    <td colspan="2" class="small" ><input type="submit" name="parserSettings" value="Submit" class="submitready"/></td>
+    <td colspan="2" class="small" ><input type="submit" name="parserSettings" value="Submit" class="btn btn-primary"/></td>
   </tr>
 </table>
 </fieldset>
diff --git a/htroot/ConfigPortal.html b/htroot/ConfigPortal.html
index be1d91c06..f884418f8 100644
--- a/htroot/ConfigPortal.html
+++ b/htroot/ConfigPortal.html
@@ -119,8 +119,8 @@
           
          <dt>&nbsp;</dt>
           <dd>
-            <input type="submit" name="searchpage_set" value="Change Search Page" class="submitready"/>&nbsp;&nbsp;
-            <input type="submit" name="searchpage_default" value="Set to Default Values" class="submitready"/>
+            <input type="submit" name="searchpage_set" value="Change Search Page" class="btn btn-primary"/>&nbsp;&nbsp;
+            <input type="submit" name="searchpage_default" value="Set to Default Values" class="btn btn-primary"/>
             <p>You have to <a href="ConfigAccounts_p.html">set a remote user/password</a> to change this options.</p>
           </dd>
         </dl>
diff --git a/htroot/ConfigProfile_p.html b/htroot/ConfigProfile_p.html
index fd313a29e..32f725ba5 100644
--- a/htroot/ConfigProfile_p.html
+++ b/htroot/ConfigProfile_p.html
@@ -64,7 +64,7 @@
         <dl>
           <dt>&nbsp;</dt>
           <dd>
-            <input type="submit" name="set" value="Save" class="submitready"/>
+            <input type="submit" name="set" value="Save" class="btn btn-primary"/>
           </dd>
         </dl>
         
diff --git a/htroot/ConfigProperties_p.html b/htroot/ConfigProperties_p.html
index da5e3c958..98699eb78 100644
--- a/htroot/ConfigProperties_p.html
+++ b/htroot/ConfigProperties_p.html
@@ -57,8 +57,8 @@
   <form action="ConfigProperties_p.html" method="post" accept-charset="UTF-8">
     <fieldset>
       <input type="text" id="key" name="key" size="40" onkeyup="filterList()" value="#[keyPosted]#"/>:<input type="text" id="value" name="value" size="40" value="#[valuePosted]#" />
-      <input type="submit" value="Save" class="submitready"/>&nbsp;
-      <input type="button" value="Clear" onclick="clear_form()" class="submitready"/>
+      <input type="submit" value="Save" class="btn btn-primary"/>&nbsp;
+      <input type="button" value="Clear" onclick="clear_form()" class="btn btn-primary"/>
     </fieldset>
   </form>
   
diff --git a/htroot/ConfigRobotsTxt_p.html b/htroot/ConfigRobotsTxt_p.html
index 01a1ab3de..2f0853abf 100644
--- a/htroot/ConfigRobotsTxt_p.html
+++ b/htroot/ConfigRobotsTxt_p.html
@@ -44,7 +44,7 @@
           <dt><label for="profile">Impressum</label></dt>
           <dd><input type="checkbox" id="profile" name="profile"#(profile.checked)#:: checked="checked"#(/profile.checked)# /></dd>
           <dt>&nbsp;</dt>
-          <dd><input type="submit" name="save" value="Save restrictions" class="submitready"/></dd>
+          <dd><input type="submit" name="save" value="Save restrictions" class="btn btn-primary"/></dd>
         </dl>
       </fieldset>
     </form>
diff --git a/htroot/ConfigSearchPage_p.html b/htroot/ConfigSearchPage_p.html
index 8e65f1c0d..9912ee98f 100644
--- a/htroot/ConfigSearchPage_p.html
+++ b/htroot/ConfigSearchPage_p.html
@@ -223,8 +223,8 @@ $(function() {
           <fieldset>
             <dt>&nbsp;</dt>
             <dd>
-              <input type="submit" name="searchpage_set" value="Save Settings" class="submitready" />&nbsp;&nbsp;
-              <input type="submit" name="searchpage_default" value="Set Default Values" class="submitready" />
+              <input type="submit" name="searchpage_set" value="Save Settings" class="btn btn-primary" />&nbsp;&nbsp;
+              <input type="submit" name="searchpage_default" value="Set Default Values" class="btn btn-primary" />
             </dd>
           </fieldset>
         </td>
diff --git a/htroot/ContentControl_p.html b/htroot/ContentControl_p.html
index 0cf904c80..b3b234248 100644
--- a/htroot/ContentControl_p.html
+++ b/htroot/ContentControl_p.html
@@ -37,7 +37,7 @@
                 </p>
               </dd>
               <dt></dt>
-              <dd><input type="submit" name="contentcontrolSettings" value="Submit" class="submitready"/></dd>
+              <dd><input type="submit" name="contentcontrolSettings" value="Submit" class="btn btn-primary"/></dd>
             </dl>
 </fieldset>
 </form>
@@ -84,7 +84,7 @@
                 </p>
               </dd>
               <dt></dt>
-              <dd><input type="submit" name="contentcontrolExtraSettings" value="Submit" class="submitready"/></dd>
+              <dd><input type="submit" name="contentcontrolExtraSettings" value="Submit" class="btn btn-primary"/></dd>
             </dl>
 </fieldset>
 </form>  
diff --git a/htroot/ContentIntegrationPHPBB3_p.html b/htroot/ContentIntegrationPHPBB3_p.html
index 4d8f09478..4eeb7e718 100644
--- a/htroot/ContentIntegrationPHPBB3_p.html
+++ b/htroot/ContentIntegrationPHPBB3_p.html
@@ -58,11 +58,11 @@
           
           <dt>&nbsp;</dt>
           <dd>
-            <input type="submit" name="check" value="Check database connection" class="submitready" style="width:240px"/>
+            <input type="submit" name="check" value="Check database connection" class="btn btn-primary" style="width:240px"/>
           </dd>
           <dt>&nbsp;</dt>
           <dd>
-            <input type="submit" name="export" value="Export Content to Surrogates" class="submitready" style="width:240px"/>
+            <input type="submit" name="export" value="Export Content to Surrogates" class="btn btn-primary" style="width:240px"/>
           </dd>
         </dl>
       </fieldset>
@@ -72,7 +72,7 @@
           <dd><input type="text" name="content.phpbb3.dumpfile" value="#[content.phpbb3.dumpfile]#" size="60" /></dd>
           <dt>&nbsp;</dt>
           <dd>
-            <input type="submit" name="import" value="Import Dump" class="submitready" style="width:240px"/>
+            <input type="submit" name="import" value="Import Dump" class="btn btn-primary" style="width:240px"/>
           </dd>
 		</dl>
       </fieldset>
diff --git a/htroot/CookieMonitorIncoming_p.html b/htroot/CookieMonitorIncoming_p.html
index 9cc003c3f..09910c6ba 100644
--- a/htroot/CookieMonitorIncoming_p.html
+++ b/htroot/CookieMonitorIncoming_p.html
@@ -28,8 +28,8 @@
     </table>
     <form action="" method="post" accept-charset="UTF-8">
       <fieldset>
-        #(monitorCookies.off)#::<input type="submit" name="enableCookieMonitoring" value="Enable Cookie Monitoring" class="submitready" style="width:240px"/>#(/monitorCookies.off)#
-        #(monitorCookies.on)#::<input type="submit" name="disableCookieMonitoring" value="Disable Cookie Monitoring" class="submitready" style="width:240px"/>#(/monitorCookies.on)#
+        #(monitorCookies.off)#::<input type="submit" name="enableCookieMonitoring" value="Enable Cookie Monitoring" class="btn btn-primary" style="width:240px"/>#(/monitorCookies.off)#
+        #(monitorCookies.on)#::<input type="submit" name="disableCookieMonitoring" value="Disable Cookie Monitoring" class="btn btn-primary" style="width:240px"/>#(/monitorCookies.on)#
       </fieldset>
     </form>
     #%env/templates/footer.template%#
diff --git a/htroot/CookieMonitorOutgoing_p.html b/htroot/CookieMonitorOutgoing_p.html
index 56ab3cfa6..272c68f55 100644
--- a/htroot/CookieMonitorOutgoing_p.html
+++ b/htroot/CookieMonitorOutgoing_p.html
@@ -32,8 +32,8 @@
     </table>
     <form action="" method="post" accept-charset="UTF-8">
       <fieldset>
-        #(monitorCookies.off)#::<input type="submit" name="enableCookieMonitoring" value="Enable Cookie Monitoring" class="submitready" style="width:240px"/>#(/monitorCookies.off)#
-        #(monitorCookies.on)#::<input type="submit" name="disableCookieMonitoring" value="Disable Cookie Monitoring" class="submitready" style="width:240px"/>#(/monitorCookies.on)#
+        #(monitorCookies.off)#::<input type="submit" name="enableCookieMonitoring" value="Enable Cookie Monitoring" class="btn btn-primary" style="width:240px"/>#(/monitorCookies.off)#
+        #(monitorCookies.on)#::<input type="submit" name="disableCookieMonitoring" value="Disable Cookie Monitoring" class="btn btn-primary" style="width:240px"/>#(/monitorCookies.on)#
       </fieldset>
     </form>
     #%env/templates/footer.template%#
diff --git a/htroot/CookieTest_p.html b/htroot/CookieTest_p.html
index 7794dc113..324085ac9 100644
--- a/htroot/CookieTest_p.html
+++ b/htroot/CookieTest_p.html
@@ -11,7 +11,7 @@
     <form action="">
       <fieldset>
         <input type="hidden" name="act" value="clear_cookie" />
-        <input type="submit" name="set_action" value="Just clean it" class="submitready" style="width:260px"/>
+        <input type="submit" name="set_action" value="Just clean it" class="btn btn-primary" style="width:260px"/>
       </fieldset>
     </form>
     <hr />
@@ -24,7 +24,7 @@
           <dt><label for="cookie_value">Value:</label></dt>
           <dd><input type="text" name="cookie_value" id="cookie_value" /></dd>
         </dl>
-        <input type="submit" name="set_action" value="Dear server, set this cookie for me!" class="submitready" style="width:260px"/>
+        <input type="submit" name="set_action" value="Dear server, set this cookie for me!" class="btn btn-primary" style="width:260px"/>
       </fieldset>
     </form>
     <hr />
diff --git a/htroot/CrawlCheck_p.html b/htroot/CrawlCheck_p.html
index 8424afe6e..3eed994cf 100644
--- a/htroot/CrawlCheck_p.html
+++ b/htroot/CrawlCheck_p.html
@@ -35,7 +35,7 @@
            <textarea name="crawlingURLs" id="crawlingURLs" cols="80" rows="15" size="80">#[starturls]#</textarea>
         </dd>      
         <dt></dt>
-        <dd><input type="submit" name="crawlcheck" value="Check given urls" class="submitready"/>
+        <dd><input type="submit" name="crawlcheck" value="Check given urls" class="btn btn-primary"/>
         </dd>
       </dl>
       
diff --git a/htroot/CrawlProfileEditor_p.html b/htroot/CrawlProfileEditor_p.html
index 8a184b0f3..f2e0a267d 100644
--- a/htroot/CrawlProfileEditor_p.html
+++ b/htroot/CrawlProfileEditor_p.html
@@ -92,7 +92,7 @@
         <select name="handle">#{profiles}# 
           <option value="#[handle]#"#(selected)#:: selected="selected"#(/selected)#>#[name]#</option>#{/profiles}# 
         </select>
-        <input type="submit" name="edit" value="Edit profile" class="submitready"/>
+        <input type="submit" name="edit" value="Edit profile" class="btn btn-primary"/>
       </fieldset>
     </form>
     
@@ -114,7 +114,7 @@
                     type="text" value="#[value]#" size="120" maxlength="10000"#(/type)# />::
             <strong>#(type)##(checked)#false::true#(/checked)#::#[value]#::#[value]##(/type)#</strong>#(/readonly)# 
           </dd>#{/entries}# 
-        <dt>&nbsp;</dt><dd><input type="submit" name="submit" value="Submit changes" class="submitready"/></dd>
+        <dt>&nbsp;</dt><dd><input type="submit" name="submit" value="Submit changes" class="btn btn-primary"/></dd>
         </dl>
       </fieldset>
     </form>
diff --git a/htroot/CrawlStartExpert_p.html b/htroot/CrawlStartExpert_p.html
index 93848813a..e0c43e0be 100644
--- a/htroot/CrawlStartExpert_p.html
+++ b/htroot/CrawlStartExpert_p.html
@@ -508,7 +508,7 @@
 	      </dl>
         </fieldset>
 
-          <dt><input type="hidden" name="crawlingstart" value="1"/><input type="submit" value="Start New Crawl Job" class="submitready"/></dt><dd></dd>
+          <dt><input type="hidden" name="crawlingstart" value="1"/><input type="submit" value="Start New Crawl Job" class="btn btn-primary"/></dt><dd></dd>
         </dl>
       </fieldset>
     </form>
diff --git a/htroot/CrawlStartScanner_p.html b/htroot/CrawlStartScanner_p.html
index c01c6a6b6..1d1219957 100644
--- a/htroot/CrawlStartScanner_p.html
+++ b/htroot/CrawlStartScanner_p.html
@@ -89,7 +89,7 @@
     </dd>
     
     <dt>&nbsp;</dt>
-    <dd><input type="submit" id="scan" name="scan" value="Scan" class="submitready"/><div class="info" id="scanhostinfo" style="text-decoration: blink;">&nbsp;</div></dd>
+    <dd><input type="submit" id="scan" name="scan" value="Scan" class="btn btn-primary"/><div class="info" id="scanhostinfo" style="text-decoration: blink;">&nbsp;</div></dd>
     </dl>
     </fieldset>
     </form>
diff --git a/htroot/CrawlStartSite_p.html b/htroot/CrawlStartSite_p.html
index 375dc6beb..a9f47b7cc 100644
--- a/htroot/CrawlStartSite_p.html
+++ b/htroot/CrawlStartSite_p.html
@@ -90,7 +90,7 @@
           <input type="hidden" name="indexText" id="indexText" value="on" />
           <input type="hidden" name="indexMedia" id="indexMedia" value="on" />
           <input type="hidden" name="intention" id="intention" value="" />
-          <input type="submit" name="crawlingstart" value="Start New Crawl" class="submitready"/>
+          <input type="submit" name="crawlingstart" value="Start New Crawl" class="btn btn-primary"/>
         </dd>
       </dl>
       
diff --git a/htroot/HostBrowser.html b/htroot/HostBrowser.html
index 1a1366f61..41aee5290 100644
--- a/htroot/HostBrowser.html
+++ b/htroot/HostBrowser.html
@@ -80,10 +80,10 @@ function updatepage(str) {
     <fieldset class="yacys">
       Host/URL: 
       <input id="search" type="text" name="path" value="#[path]#" size="80" maxlength="250" />
-      <input type="submit" name="list" value="Browse Host" class="submitready" style="width:160px;"/>
+      <input type="submit" name="list" value="Browse Host" class="btn btn-primary" style="width:160px;"/>
       #(delete)#::
-      <input type="submit" name="delete" value="Delete Subpath" class="submitready" style="width:160px;" onclick="return confirm('Confirm Deletion')"/>
-      <input type="submit" name="reload404" value="Re-Load 404" class="submitready" style="width:160px;"/>
+      <input type="submit" name="delete" value="Delete Subpath" class="btn btn-primary" style="width:160px;" onclick="return confirm('Confirm Deletion')"/>
+      <input type="submit" name="reload404" value="Re-Load 404" class="btn btn-primary" style="width:160px;"/>
       #(/delete)#
       <br />
       <div id="searchresults"></div>
diff --git a/htroot/HostBrowserAdmin_p.html b/htroot/HostBrowserAdmin_p.html
index fcb5d6e92..ef59f9289 100644
--- a/htroot/HostBrowserAdmin_p.html
+++ b/htroot/HostBrowserAdmin_p.html
@@ -4,7 +4,7 @@
      <fieldset><legend>Administration Options</legend>
        <dl>             
          <dd>
-           <div>Delete all <spawn class="error">Load Errors</spawn> from index <input style="width:240px " type="submit" name="deleteLoadErrors" value="Delete Load Errors" class="submitready"/></div>
+           <div>Delete all <spawn class="error">Load Errors</spawn> from index <input style="width:240px " type="submit" name="deleteLoadErrors" value="Delete Load Errors" class="btn btn-primary"/></div>
          </dd>
        </dl>
      </fieldset>
diff --git a/htroot/IndexControlRWIs_p.html b/htroot/IndexControlRWIs_p.html
index dbd3f4ad9..258838386 100644
--- a/htroot/IndexControlRWIs_p.html
+++ b/htroot/IndexControlRWIs_p.html
@@ -14,13 +14,13 @@
       <dl>        
         <dt class="TableCellDark">Retrieve by Word:</dt>
         <dd><input type="text" name="keystring" value="#[keystring]#" size="40" maxlength="80" />
-            <input type="submit" name="keystringsearch" value="Show URL Entries for Word" class="submitready" style="width:240px;"/>
+            <input type="submit" name="keystringsearch" value="Show URL Entries for Word" class="btn btn-primary" style="width:240px;"/>
         </dd>
           
         <dt class="TableCellDark">Retrieve by Word-Hash:</dt>
         <dd><input type="text" name="keyhash" value="#[keyhash]#" size="40" maxlength="12" />
-            <input type="submit" name="keyhashsearch" value="Show URL Entries for Word-Hash" class="submitready" style="width:240px;"/>
-            <input type="submit" name="keyhashsimilar" value="Generate List" class="submitready" style="width:240px;"/>
+            <input type="submit" name="keyhashsearch" value="Show URL Entries for Word-Hash" class="btn btn-primary" style="width:240px;"/>
+            <input type="submit" name="keyhashsimilar" value="Generate List" class="btn btn-primary" style="width:240px;"/>
         </dd>
       </dl>
     </fieldset>
@@ -35,7 +35,7 @@
             No reference size limitation (this may cause strong CPU load when words are searched that appear very often)<br/>
             <input type="radio" name="maxReferencesRadio" id="maxReferencesRadioOn" value="on" #(maxReferencesRadioChecked)#::checked="checked"#(/maxReferencesRadioChecked)# onclick="window.location.href='IndexControlRWIs_p.html?maxReferencesRadio=on&maxReferencesLimit=&maxReferences=#[maxReferences]#'"/>
             Limitation of number of references per word: <input type="text" name="maxReferences" value="#[maxReferences]#" size="9" maxlength="12" onfocus="document.getElementById('maxReferencesRadioOff').checked = false;document.getElementById('maxReferencesRadioOn').checked = true"/> (this causes that old references are deleted if that limit is reached)<br/><br/>
-            <input type="submit" name="maxReferencesLimit" id="maxReferencesLimit" value="Set References Limit" class="submitready" style="width:240px;"/>
+            <input type="submit" name="maxReferencesLimit" id="maxReferencesLimit" value="Set References Limit" class="btn btn-primary" style="width:240px;"/>
         </dd>
       </dl>
     </fieldset>
@@ -109,7 +109,7 @@
             <input type="radio" name="lines" value="1000" />1000&nbsp;&nbsp;
         </dd>
         <dt class="TableCellLight"></dt>
-        <dd><input type="submit" name="urllist" value="List Selected URLs" class="submitready" style="width:240px;"/>
+        <dd><input type="submit" name="urllist" value="List Selected URLs" class="btn btn-primary" style="width:240px;"/>
         </dd>
       </dl>
     </fieldset>
@@ -125,7 +125,7 @@
           </dd>
           <dt class="TableCellLight"></dt>
           <dd>
-            <input type="submit" value="Delete Word" name="keyhashdeleteall" class="submitready" style="width:240px;"/>
+            <input type="submit" value="Delete Word" name="keyhashdeleteall" class="btn btn-primary" style="width:240px;"/>
           </dd>
         </dl>
     </fieldset>
@@ -133,7 +133,7 @@
       <dl>
         <dt class="TableCellDark">Transfer by Word-Hash:</dt>
         <dd><input type="text" name="keyhash" value="#[keyhash]#" size="40" maxlength="12" />
-            <input type="submit" name="keyhashtransfer" value="Transfer to other peer" class="submitready" style="width:240px;"/>
+            <input type="submit" name="keyhashtransfer" value="Transfer to other peer" class="btn btn-primary" style="width:240px;"/>
         </dd>
         <dt class="TableCellDark">to Peer:</dt>
         <dd>select <select name="hostHash">
@@ -243,7 +243,7 @@
           </dd>
           <dt class="TableCellLight"></dt>
           <dd>
-            <input type="submit" value="Delete reference to selected URLs" name="keyhashdelete" class="submitready" style="width:240px;"/><br />
+            <input type="submit" value="Delete reference to selected URLs" name="keyhashdelete" class="btn btn-primary" style="width:240px;"/><br />
           </dd>
         </dl>
       </fieldset>
@@ -255,8 +255,8 @@
             </select>
           </dt>
           <dd>
-            <input type="submit" value="Add selected URLs to blacklist" name="blacklisturls" class="submitready" style="width:240px;"/><br />
-            <input type="submit" value="Add selected domains to blacklist" name="blacklistdomains" class="submitready" style="width:240px; margin-top: 5px;"/>
+            <input type="submit" value="Add selected URLs to blacklist" name="blacklisturls" class="btn btn-primary" style="width:240px;"/><br />
+            <input type="submit" value="Add selected domains to blacklist" name="blacklistdomains" class="btn btn-primary" style="width:240px; margin-top: 5px;"/>
           </dd>
         </dl>
       </fieldset>
diff --git a/htroot/IndexControlURLs_p.html b/htroot/IndexControlURLs_p.html
index d578c4296..66db4ba33 100644
--- a/htroot/IndexControlURLs_p.html
+++ b/htroot/IndexControlURLs_p.html
@@ -81,13 +81,13 @@ function updatepage(str) {
         
         <dt class="TableCellDark">Retrieve by URL:</dt>
         <dd><input type="text" name="urlstring" value="#[urlstring]#" size="40" maxlength="250" />
-            <input type="submit" name="urlstringsearch" value="Show Details for URL" class="submitready" style="width:240px;"/><br />
+            <input type="submit" name="urlstringsearch" value="Show Details for URL" class="btn btn-primary" style="width:240px;"/><br />
             <div id="searchresults"></div>
         </dd>
         
         <dt class="TableCellDark">Retrieve by URL-Hash:</dt>
         <dd><input type="text" name="urlhash" value="#[urlhash]#" size="40" maxlength="12" />
-            <input type="submit" name="urlhashsearch" value="Show Details for URL-Hash" class="submitready" style="width:240px;"/>
+            <input type="submit" name="urlhashsearch" value="Show Details for URL-Hash" class="btn btn-primary" style="width:240px;"/>
         </dd>
       </dl>
     </fieldset>
@@ -108,7 +108,7 @@ function updatepage(str) {
             <input type="checkbox" name="deleteCrawlQueues" id="deleteCrawlQueues" disabled="disabled" /> Stop Crawler and delete Crawl Queues<br/>
             <input type="checkbox" name="deleteRobots" id="deleteRobots" disabled="disabled" /> Delete robots.txt Cache<br/>
             <input type="checkbox" name="deleteSearchFl" id="deleteSearchFl" disabled="disabled" /> Delete cached snippet-fetching failures during search<br/><br/>
-            <input type="submit" name="deletecomplete" id="deletecomplete" value="Delete" disabled="disabled" class="submitready" style="width:240px;"/>
+            <input type="submit" name="deletecomplete" id="deletecomplete" value="Delete" disabled="disabled" class="btn btn-primary" style="width:240px;"/>
         </dd>
       </dl>
     </fieldset>
@@ -121,7 +121,7 @@ function updatepage(str) {
       <dl>
         <dt class="TableCellDark">&nbsp;</dt>
         <dd>Show top <input type="text" name="lines" value="#[lines]#" size="6" maxlength="6" /> domains from all URLs.
-            <input type="submit" name="statistics" value="Generate Statistics" class="submitready" style="width:240px;"/>
+            <input type="submit" name="statistics" value="Generate Statistics" class="btn btn-primary" style="width:240px;"/>
         </dd>
       </dl>
     </fieldset>
@@ -143,7 +143,7 @@ function updatepage(str) {
             <div>
               <input type="hidden" name="domain" value="#[domain]#" />
               <input type="hidden" name="lines" value="#[lines]#" />
-              <input type="submit" name="deletedomain" value="delete all" class="submitready" style="width:240px;"/>
+              <input type="submit" name="deletedomain" value="delete all" class="btn btn-primary" style="width:240px;"/>
             </div>
           </form>
         </td>
@@ -159,7 +159,7 @@ function updatepage(str) {
     <fieldset><legend>Dump and Restore of Solr Index</legend>
       <dl>
         <dt class="TableCellDark">&nbsp;</dt>
-        <dd><input type="submit" name="indexdump" value="Create Dump" class="submitready" style="width:240px;"/>
+        <dd><input type="submit" name="indexdump" value="Create Dump" class="btn btn-primary" style="width:240px;"/>
         </dd>
       </dl>
       <dl>
@@ -167,7 +167,7 @@ function updatepage(str) {
         <dd><input type="text" name="dumpfile" value="#[dumpfile]#" size="80" maxlength="250" />
         </dd>
         <dt class="TableCellDark">&nbsp;</dt>
-        <dd><input type="submit" name="indexrestore" value="Restore Dump" class="submitready" style="width:240px;"/>
+        <dd><input type="submit" name="indexrestore" value="Restore Dump" class="btn btn-primary" style="width:240px;"/>
         </dd>
       </dl>
     </fieldset>
@@ -177,7 +177,7 @@ function updatepage(str) {
       <dl>
         <dt class="TableCellDark">&nbsp;</dt>
         <dd>merge to max. <input type="text" name="optimizemax" value="#[optimizemax]#" size="6" maxlength="6" /> segments
-        <input type="submit" name="optimizesolr" value="Optimize Solr" class="submitready" style="width:240px;"/>
+        <input type="submit" name="optimizesolr" value="Optimize Solr" class="btn btn-primary" style="width:240px;"/>
         </dd>
       </dl>
     </fieldset>
@@ -186,7 +186,7 @@ function updatepage(str) {
     <fieldset><legend>Reboot Solr Core</legend>
       <dl>
         <dt class="TableCellDark">&nbsp;</dt>
-        <dd><input type="submit" name="rebootsolr" value="Shut Down and Re-Start Solr" class="submitready" style="width:240px;"/>
+        <dd><input type="submit" name="rebootsolr" value="Shut Down and Re-Start Solr" class="btn btn-primary" style="width:240px;"/>
         </dd>
       </dl>
     </fieldset>
@@ -217,7 +217,7 @@ function updatepage(str) {
             <br />
         </dd>
         <dt class="TableCellDark">&nbsp;</dt>
-        <dd><input type="submit" name="lurlexport" value="Export URLs" class="submitready" style="width:240px;"/>
+        <dd><input type="submit" name="lurlexport" value="Export URLs" class="btn btn-primary" style="width:240px;"/>
         </dd>
       </dl>
     </fieldset>
@@ -245,16 +245,16 @@ function updatepage(str) {
 		<input type="hidden" name="viewMode" value="parsed" />
 		<input type="hidden" name="show" value="Show" />
 		<input type="hidden" name="urlHash" value="#[urlhash]#" />
-		<input type="submit" value="Show Content" name="showcontent" class="submitready" style="width:240px;"/><br />
+		<input type="submit" value="Show Content" name="showcontent" class="btn btn-primary" style="width:240px;"/><br />
 	</form>
 	<form action="IndexControlURLs_p.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
 		<input type="hidden" name="keystring" value="" />
 		<input type="hidden" name="keyhash" value="" />
 		<input type="hidden" name="urlstring" value="" />
 		<input type="hidden" name="urlhash" value="#[urlhash]#" />
-		<input type="submit" value="Delete URL" name="urlhashdelete" class="submitready" style="width:240px;"/><br />
+		<input type="submit" value="Delete URL" name="urlhashdelete" class="btn btn-primary" style="width:240px;"/><br />
 		<span class="small">&nbsp;this may produce unresolved references at other word indexes but they do not harm</span><br /><br />
-		<input type="submit" value="Delete URL and remove all references from words" name="urlhashdeleteall" class="submitready" style="width:240px;"/><br />
+		<input type="submit" value="Delete URL and remove all references from words" name="urlhashdeleteall" class="btn btn-primary" style="width:240px;"/><br />
 		<span class="small">&nbsp;delete the reference to this url at every other word where the reference exists (very extensive, but prevents unresolved references)</span><br />
 	</form>
     #(/genUrlProfile)#
diff --git a/htroot/IndexDeletion_p.html b/htroot/IndexDeletion_p.html
index 2dceb9d75..68c8e91f9 100644
--- a/htroot/IndexDeletion_p.html
+++ b/htroot/IndexDeletion_p.html
@@ -17,14 +17,14 @@
       <dl>
         <dt>One URL stub, a list of URL stubs<br/>or a regular expression</dt>
         <dd>
-          <textarea name="urldelete" id="crawlingURL" cols="64" rows="3" size="41" onClick="d=document.getElementById('engage-urldelete');d.disabled=true;d.className='dangerdisarmed';">#[urldelete]#</textarea>
+          <textarea name="urldelete" id="crawlingURL" cols="64" rows="3" size="41" onClick="d=document.getElementById('engage-urldelete');d.disabled=true;d.className='btn btn-default';">#[urldelete]#</textarea>
         </dd>
         <dt>Matching Method</dt>
         <dd>
           <input type="radio" name="urldelete-mm" value="subpath" #(urldelete-mm-subpath-checked)#::checked="checked"#(/urldelete-mm-subpath-checked)# />sub-path of given URLs&nbsp;&nbsp;&nbsp;
           <input type="radio" name="urldelete-mm" value="regexp" #(urldelete-mm-regexp-checked)#::checked="checked"#(/urldelete-mm-regexp-checked)# />matching with regular expression
-        <dt><input type="submit" name="simulate-urldelete" value="Simulate Deletion" class="submitready" title="no actual deletion, generates only a deletion count"/></dt>
-        <dd><input type="submit" name="engage-urldelete" id="engage-urldelete" value="Engage Deletion" #(urldelete-active)#class="dangerdisarmed" disabled="disabled" title="simulate a deletion first to calculate the deletion count"::class="dangerready"::class="dangerdisarmed" disabled="disabled" title="engaged"#(/urldelete-active)#/>
+        <dt><input type="submit" name="simulate-urldelete" value="Simulate Deletion" class="btn btn-primary" title="no actual deletion, generates only a deletion count"/></dt>
+        <dd><input type="submit" name="engage-urldelete" id="engage-urldelete" value="Engage Deletion" #(urldelete-active)#class="btn btn-default" disabled="disabled" title="simulate a deletion first to calculate the deletion count"::class="btn btn-warning"::class="btn btn-default" disabled="disabled" title="engaged"#(/urldelete-active)#/>
           #(urldelete-active)#::<span class="pending">selected #[count]# documents for deletion</span><input type="hidden" name="count" id="count" value="#[count]#" />::<span class="commit">deleted #[count]# documents</span>#(/urldelete-active)#
         </dd>
       </dl>
@@ -38,7 +38,7 @@
       <dl>
         <dt>Time Period</dt>
         <dd>All documents older than
-          <select name="timedelete-number" id="timedelete-number" onClick="d=document.getElementById('engage-timedelete');d.disabled=true;d.className='dangerdisarmed';">
+          <select name="timedelete-number" id="timedelete-number" onClick="d=document.getElementById('engage-timedelete');d.disabled=true;d.className='btn btn-default';">
             <option value="1" #(timedelete-n-1)#::selected="selected"#(/timedelete-n-1)#>1</option>
             <option value="2" #(timedelete-n-2)#::selected="selected"#(/timedelete-n-2)#>2</option>
             <option value="3" #(timedelete-n-3)#::selected="selected"#(/timedelete-n-3)#>3</option>
@@ -58,7 +58,7 @@
             <option value="60" #(timedelete-n-60)#::selected="selected"#(/timedelete-n-60)#>60</option>
             <option value="90" #(timedelete-n-90)#::selected="selected"#(/timedelete-n-90)#>90</option>
           </select>
-          <select name="timedelete-unit" id="timedelete-unit" onClick="d=document.getElementById('engage-timedelete');d.disabled=true;d.className='dangerdisarmed';">
+          <select name="timedelete-unit" id="timedelete-unit" onClick="d=document.getElementById('engage-timedelete');d.disabled=true;d.className='btn btn-default';">
             <option value="year" #(timedelete-u-year)#::selected="selected"#(/timedelete-u-year)#>years</option>
             <option value="month" #(timedelete-u-month)#::selected="selected"#(/timedelete-u-month)#>months</option>
             <option value="day" #(timedelete-u-day)#::selected="selected"#(/timedelete-u-day)#>days</option>
@@ -67,11 +67,11 @@
         </dd>
         <dt>Age Identification</dt>
         <dd>
-          <input type="radio" name="timedelete-source" value="loaddate" #(timedelete-source-loaddate-checked)#::checked="checked"#(/timedelete-source-loaddate-checked)# onClick="d=document.getElementById('engage-timedelete');d.disabled=true;d.className='dangerdisarmed';"/>load date&nbsp;&nbsp;&nbsp;
-          <input type="radio" name="timedelete-source" value="lastmodified" #(timedelete-source-lastmodified-checked)#::checked="checked"#(/timedelete-source-lastmodified-checked)# onClick="d=document.getElementById('engage-timedelete');d.disabled=true;d.className='dangerdisarmed';"/>last-modified
+          <input type="radio" name="timedelete-source" value="loaddate" #(timedelete-source-loaddate-checked)#::checked="checked"#(/timedelete-source-loaddate-checked)# onClick="d=document.getElementById('engage-timedelete');d.disabled=true;d.className='btn btn-default';"/>load date&nbsp;&nbsp;&nbsp;
+          <input type="radio" name="timedelete-source" value="lastmodified" #(timedelete-source-lastmodified-checked)#::checked="checked"#(/timedelete-source-lastmodified-checked)# onClick="d=document.getElementById('engage-timedelete');d.disabled=true;d.className='btn btn-default';"/>last-modified
         </dd>
-        <dt><input type="submit" name="simulate-timedelete" value="Simulate Deletion" class="submitready" title="no actual deletion, generates only a deletion count"/></dt>
-        <dd><input type="submit" name="engage-timedelete" id="engage-timedelete" value="Engage Deletion" #(timedelete-active)#class="dangerdisarmed" disabled="disabled" title="simulate a deletion first to calculate the deletion count"::class="dangerready"::class="dangerdisarmed" disabled="disabled" title="engaged"#(/timedelete-active)#/>
+        <dt><input type="submit" name="simulate-timedelete" value="Simulate Deletion" class="btn btn-primary" title="no actual deletion, generates only a deletion count"/></dt>
+        <dd><input type="submit" name="engage-timedelete" id="engage-timedelete" value="Engage Deletion" #(timedelete-active)#class="btn btn-default" disabled="disabled" title="simulate a deletion first to calculate the deletion count"::class="btn btn-warning"::class="btn btn-default" disabled="disabled" title="engaged"#(/timedelete-active)#/>
           #(timedelete-active)#::<span class="pending">selected #[count]# documents for deletion</span><input type="hidden" name="count" id="count" value="#[count]#" />::<span class="commit">deleted #[count]# documents</span>#(/timedelete-active)#
         </dd>
       </dl>
@@ -84,19 +84,19 @@
       <p>Delete all documents which are inside specific collections.</p>
       <dl>
         <dt>Not Assigned</dt>
-        <dd><input type="radio" name="collectiondelete-mode" id="collectiondelete-mode-unassigned" value="unassigned" #(collectiondelete-mode-unassigned-checked)#::checked="checked"#(/collectiondelete-mode-unassigned-checked)# onClick="d=document.getElementById('engage-collectiondelete');d.disabled=true;d.className='dangerdisarmed';"/>Delete all documents which are not assigned to any collection
+        <dd><input type="radio" name="collectiondelete-mode" id="collectiondelete-mode-unassigned" value="unassigned" #(collectiondelete-mode-unassigned-checked)#::checked="checked"#(/collectiondelete-mode-unassigned-checked)# onClick="d=document.getElementById('engage-collectiondelete');d.disabled=true;d.className='btn btn-default';"/>Delete all documents which are not assigned to any collection
         </dd>
         
         <dt>Assigned</dt>
-        <dd><input type="radio" name="collectiondelete-mode" id="collectiondelete-mode-assigned" value="assigned" #(collectiondelete-mode-assigned-checked)#::checked="checked"#(/collectiondelete-mode-assigned-checked)# onClick="d=document.getElementById('engage-collectiondelete');d.disabled=true;d.className='dangerdisarmed';"/>Delete all documents which are assigned to the following collection(s)
-        #(collectiondelete-select)#, separated by ',' (comma) or '|' (vertical bar); or <a href="IndexDeletion_p.html?collectionlist=">generate the collection list...</a><br/><input type="text" name="collectiondelete" id="collections" value="#[collectiondelete]#" size="96" maxlength="1024" onClick="d=document.getElementById('engage-collectiondelete');d.disabled=true;d.className='dangerdisarmed';document.getElementById('collectiondelete-mode-assigned').checked=true;"/>::
+        <dd><input type="radio" name="collectiondelete-mode" id="collectiondelete-mode-assigned" value="assigned" #(collectiondelete-mode-assigned-checked)#::checked="checked"#(/collectiondelete-mode-assigned-checked)# onClick="d=document.getElementById('engage-collectiondelete');d.disabled=true;d.className='btn btn-default';"/>Delete all documents which are assigned to the following collection(s)
+        #(collectiondelete-select)#, separated by ',' (comma) or '|' (vertical bar); or <a href="IndexDeletion_p.html?collectionlist=">generate the collection list...</a><br/><input type="text" name="collectiondelete" id="collections" value="#[collectiondelete]#" size="96" maxlength="1024" onClick="d=document.getElementById('engage-collectiondelete');d.disabled=true;d.className='btn btn-default';document.getElementById('collectiondelete-mode-assigned').checked=true;"/>::
         <br/><select id="collectiondelete" name="collectiondelete">
-          #{list}#<option value="#[collection-value]#" onClick="d=document.getElementById('engage-collectiondelete');d.disabled=true;d.className='dangerdisarmed';document.getElementById('collectiondelete-mode-assigned').checked=true;">#[collection-name]#</option>#{/list}#
+          #{list}#<option value="#[collection-value]#" onClick="d=document.getElementById('engage-collectiondelete');d.disabled=true;d.className='btn btn-default';document.getElementById('collectiondelete-mode-assigned').checked=true;">#[collection-name]#</option>#{/list}#
         </select>
         #(/collectiondelete-select)#
         </dd>
-        <dt><input type="submit" name="simulate-collectiondelete" value="Simulate Deletion" class="submitready" title="no actual deletion, generates only a deletion count"/></dt>
-        <dd><input type="submit" name="engage-collectiondelete" id="engage-collectiondelete" value="Engage Deletion" #(collectiondelete-active)#class="dangerdisarmed" disabled="disabled" title="simulate a deletion first to calculate the deletion count"::class="dangerready"::class="dangerdisarmed" disabled="disabled" title="engaged"#(/collectiondelete-active)#/>
+        <dt><input type="submit" name="simulate-collectiondelete" value="Simulate Deletion" class="btn btn-primary" title="no actual deletion, generates only a deletion count"/></dt>
+        <dd><input type="submit" name="engage-collectiondelete" id="engage-collectiondelete" value="Engage Deletion" #(collectiondelete-active)#class="btn btn-default" disabled="disabled" title="simulate a deletion first to calculate the deletion count"::class="btn btn-warning"::class="btn btn-default" disabled="disabled" title="engaged"#(/collectiondelete-active)#/>
           #(collectiondelete-active)#::<span class="pending">selected #[count]# documents for deletion</span><input type="hidden" name="count" id="count" value="#[count]#" />::<span class="commit">deleted #[count]# documents</span>#(/collectiondelete-active)#
         </dd>
       </dl>
@@ -110,10 +110,10 @@
       <dl>
         <dt>q=</dt>
         <dd>
-        <input type="text" name="querydelete" id="querydelete" value="#[querydelete]#" size="96" maxlength="1024" onClick="d=document.getElementById('engage-querydelete');d.disabled=true;d.className='dangerdisarmed';"/>
+        <input type="text" name="querydelete" id="querydelete" value="#[querydelete]#" size="96" maxlength="1024" onClick="d=document.getElementById('engage-querydelete');d.disabled=true;d.className='btn btn-default';"/>
         </dd>
-        <dt><input type="submit" name="simulate-querydelete" value="Simulate Deletion" class="submitready" title="no actual deletion, generates only a deletion count"/></dt>
-        <dd><input type="submit" name="engage-querydelete" id="engage-querydelete" value="Engage Deletion" #(querydelete-active)#class="dangerdisarmed" disabled="disabled" title="simulate a deletion first to calculate the deletion count"::class="dangerready"::class="dangerdisarmed" disabled="disabled" title="engaged"#(/querydelete-active)#/>
+        <dt><input type="submit" name="simulate-querydelete" value="Simulate Deletion" class="btn btn-primary" title="no actual deletion, generates only a deletion count"/></dt>
+        <dd><input type="submit" name="engage-querydelete" id="engage-querydelete" value="Engage Deletion" #(querydelete-active)#class="btn btn-default" disabled="disabled" title="simulate a deletion first to calculate the deletion count"::class="btn btn-warning"::class="btn btn-default" disabled="disabled" title="engaged"#(/querydelete-active)#/>
           #(querydelete-active)#::<span class="pending">selected #[count]# documents for deletion</span><input type="hidden" name="count" id="count" value="#[count]#" />::<span class="commit">deleted #[count]# documents</span>#(/querydelete-active)#
         </dd>
       </dl>
diff --git a/htroot/api/table_p.html b/htroot/api/table_p.html
index a3c8732c3..8c419ce37 100644
--- a/htroot/api/table_p.html
+++ b/htroot/api/table_p.html
@@ -32,7 +32,7 @@
       <p>
       <input type="hidden" name="table" value="#[table]#" />
       <input type="hidden" name="num" value="#[num]#" />
-      <input type="submit" name="edittable" value="Edit Table" class="submitready"/>
+      <input type="submit" name="edittable" value="Edit Table" class="btn btn-primary"/>
       </p>
       </fieldset>
     </form>
diff --git a/htroot/api/ymarks/test_import.html b/htroot/api/ymarks/test_import.html
index 15eabdb49..e30fbf137 100644
--- a/htroot/api/ymarks/test_import.html
+++ b/htroot/api/ymarks/test_import.html
@@ -63,7 +63,7 @@
 					    <input type="radio" name="autotag" value="merge" /> Merging with existing tags
 					</dd>
 				</dl>
-				<input type="submit" name="importbookmarks" value="import" class="submitready"/>
+				<input type="submit" name="importbookmarks" value="import" class="btn btn-primary"/>
 			</fieldset>
 		</form>
 	</body>
diff --git a/htroot/www/welcome.html b/htroot/www/welcome.html
index e95a7dcae..217e7a862 100644
--- a/htroot/www/welcome.html
+++ b/htroot/www/welcome.html
@@ -26,7 +26,7 @@
     </td>
     <td width="240" align="right">
         <form action="http://#[peerdomain]#.yacy" method="post" accept-charset="UTF-8">
-          <input type="submit" value="#[peername]#'s Console" class="small" class="submitready">
+          <input type="submit" value="#[peername]#'s Console" class="small" class="btn btn-primary">
         </form>
     </td>
   </tr>
diff --git a/skins/pdblue.css b/skins/pdblue.css
index 4ed5a31cb..ba9cb02e4 100644
--- a/skins/pdblue.css
+++ b/skins/pdblue.css
@@ -302,75 +302,3 @@ form dt, dl.pairs dt {
 form dd, dl.pairs dd {
   background-color:#DEE6F3;
 }
-
-.submitready {
-	height:20px;
-	min-width:160px;
-    font-size:1.2em;
-    padding-left:1.2em;
-    color:white;
-	
-    -webkit-border-radius: 20px;
-    -moz-border-radius: 20px;
-    -khtml-border-radius: 20px;
-    border-radius: 20px;
-    border: 0px;
-	
-    background:#5090D0;
-    background-image:url("/env/grafics/ok.png");
-    background-size: 16px 16px;
-    background-repeat:no-repeat;
-    background-position: 2px center;
-}
-
-.submitready:hover {
-    background:#65AC2A;
-    background-image:url("/env/grafics/ok.png");
-    background-size: 16px 16px;
-    background-repeat:no-repeat;
-    background-position: 2px center;
-}
-
-.dangerdisarmed {
-	height:20px;
-	min-width:160px;
-    font-size:1.2em;
-    padding-left:2em;
-    color:white;
-	
-    -webkit-border-radius: 20px;
-    -moz-border-radius: 20px;
-    -khtml-border-radius: 20px;
-    border-radius: 20px;
-    border: 0px;
-	
-    background:#dddddd;
-}
-
-.dangerready {
-	height:20px;
-	min-width:160px;
-    font-size:1.2em;
-    padding-left:2em;
-    color:white;
-	
-    -webkit-border-radius: 20px;
-    -moz-border-radius: 20px;
-    -khtml-border-radius: 20px;
-    border-radius: 20px;
-    border: 0px;
-	
-    background:#ff6000;
-    background-image:url("/env/grafics/construction.gif");
-    background-size: 24px 16px;
-    background-repeat:no-repeat;
-    background-position: 4px center;
-}
-
-.dangerready:hover {
-    background:#ff0000;
-    background-image:url("/env/grafics/construction.gif");
-    background-size: 24px 16px;
-    background-repeat:no-repeat;
-    background-position: 4px center;
-}
\ No newline at end of file