diff --git a/kallithea/public/css/style.css b/kallithea/public/css/style.css
--- a/kallithea/public/css/style.css
+++ b/kallithea/public/css/style.css
@@ -917,19 +917,9 @@ input.disabled {
     background-color: #F5F5F5 !important;
 }
 
-#content div.panel div.form div.fields div.field div.input input.small,
-#content div.panel div.form div.form-horizontal div.form-group div.input input.small {
-    width: 30%;
-}
-
-#content div.panel div.form div.fields div.field div.input input.medium,
-#content div.panel div.form div.form-horizontal div.form-group div.input input.medium {
-    width: 55%;
-}
-
-#content div.panel div.form div.fields div.field div.input input.large,
-#content div.panel div.form div.form-horizontal div.form-group div.input input.large {
-    width: 85%;
+#content div.panel div.form div.fields div.field div.input input.form-control,
+#content div.panel div.form div.form-horizontal div.form-group div.input input.form-control {
+    width: 100%;
 }
 
 #content div.panel div.form div.fields div.field div.input input.date,
@@ -3489,10 +3479,6 @@ div.form div.form-horizontal div.buttons
     padding: 0;
 }
 
-#login div.form div.form-horizontal div.form-group div input.large {
-    width: 250px;
-}
-
 #login div.form div.form-horizontal div.form-group div.checkbox,
 #register div.form div.fields div.field div.checkbox,
 #register div.form div.form-horizontal div.form-group div.checkbox {
diff --git a/kallithea/templates/admin/auth/auth_settings.html b/kallithea/templates/admin/auth/auth_settings.html
--- a/kallithea/templates/admin/auth/auth_settings.html
+++ b/kallithea/templates/admin/auth/auth_settings.html
@@ -29,7 +29,7 @@
     <div class="form-horizontal">
         <div class="form-group">
             <label class="control-label" for="auth_plugins">${_("Enabled Plugins")}</label>
-            <div class="input">${h.text("auth_plugins", class_='large')}
+            <div class="input">${h.text("auth_plugins", class_='form-control')}
             <span class="help-block">${_('Comma-separated list of plugins; Kallithea will try user authentication in plugin order')}</span>
                 <div style="padding:10px 0px 10px 0px;font-weight: bold">${_('Available built-in plugins')}</div>
                 <ul>
@@ -60,7 +60,7 @@
             <div class="form-group">
                 <label class="control-label" for="${fullsetting}">${_(displayname)}</label>
                 <div class="input">
-                    ${h.password(fullsetting,class_='small')}
+                    ${h.password(fullsetting,class_='form-control')}
                     <span class="help-block">${setting["description"]}</span>
                 </div>
             </div>
@@ -68,7 +68,7 @@
             <div class="form-group">
                 <label class="control-label" for="${fullsetting}">${_(displayname)}</label>
                 <div class="input">
-                    ${h.text(fullsetting,class_='small')}
+                    ${h.text(fullsetting,class_='form-control')}
                     <span class="help-block">${setting["description"]}</span>
                 </div>
             </div>
@@ -76,7 +76,7 @@
             <div class="form-group">
                 <label class="control-label" for="${fullsetting}">${_(displayname)}</label>
                 <div class="checkboxes">
-                    <div class="checkbox">${h.checkbox(fullsetting,True,class_='small')}</div>
+                    <div class="checkbox">${h.checkbox(fullsetting,True)}</div>
                     <span class="help-block">${setting["description"]}</span>
                 </div>
             </div>
@@ -84,7 +84,7 @@
             <div class="form-group">
                 <label class="control-label" for="${fullsetting}">${_(displayname)}</label>
                 <div class="select">
-                    ${h.select(fullsetting,setting['values'][0],setting['values'],class_='small')}
+                    ${h.select(fullsetting,setting['values'][0],setting['values'],class_='form-control')}
                     <span class="help-block">${setting["description"]}</span>
                 </div>
             </div>
diff --git a/kallithea/templates/admin/defaults/defaults.html b/kallithea/templates/admin/defaults/defaults.html
--- a/kallithea/templates/admin/defaults/defaults.html
+++ b/kallithea/templates/admin/defaults/defaults.html
@@ -31,7 +31,7 @@
             <div class="form-group">
                 <label class="control-label" for="default_repo_type">${_('Type')}:</label>
                 <div class="input">
-                    ${h.select('default_repo_type','hg',c.backends,class_="medium")}
+                    ${h.select('default_repo_type','hg',c.backends,class_='form-control')}
                 </div>
             </div>
 
diff --git a/kallithea/templates/admin/my_account/my_account_api_keys.html b/kallithea/templates/admin/my_account/my_account_api_keys.html
--- a/kallithea/templates/admin/my_account/my_account_api_keys.html
+++ b/kallithea/templates/admin/my_account/my_account_api_keys.html
@@ -59,7 +59,7 @@
             <div class="form-group">
                 <label for="description">${_('New API key')}:</label>
                 <div class="input">
-                    ${h.text('description', class_='medium', placeholder=_('Description'))}
+                    ${h.text('description', class_='form-control', placeholder=_('Description'))}
                     ${h.select('lifetime', '', c.lifetime_options)}
                 </div>
             </div>
diff --git a/kallithea/templates/admin/my_account/my_account_emails.html b/kallithea/templates/admin/my_account/my_account_emails.html
--- a/kallithea/templates/admin/my_account/my_account_emails.html
+++ b/kallithea/templates/admin/my_account/my_account_emails.html
@@ -40,7 +40,7 @@
             <div class="form-group">
                 <label class="control-label" for="new_email">${_('New email address')}:</label>
                 <div class="input">
-                    ${h.text('new_email', class_='medium')}
+                    ${h.text('new_email', class_='form-control')}
                 </div>
             </div>
             <div class="form-group">
diff --git a/kallithea/templates/admin/my_account/my_account_password.html b/kallithea/templates/admin/my_account/my_account_password.html
--- a/kallithea/templates/admin/my_account/my_account_password.html
+++ b/kallithea/templates/admin/my_account/my_account_password.html
@@ -8,21 +8,21 @@ ${h.form(url('my_account_password'), met
     <div class="form-group">
         <label class="control-label" for="current_password">${_('Current password')}:</label>
         <div class="input">
-            ${h.password('current_password',class_='medium')}
+            ${h.password('current_password',class_='form-control')}
         </div>
     </div>
 
     <div class="form-group">
         <label class="control-label" for="new_password">${_('New password')}:</label>
         <div class="input">
-            ${h.password('new_password',class_='medium')}
+            ${h.password('new_password',class_='form-control')}
         </div>
     </div>
 
     <div class="form-group">
         <label class="control-label" for="new_password_confirmation">${_('Confirm new password')}:</label>
         <div class="input">
-            ${h.password('new_password_confirmation',class_='medium')}
+            ${h.password('new_password_confirmation',class_='form-control')}
         </div>
     </div>
 
diff --git a/kallithea/templates/admin/my_account/my_account_profile.html b/kallithea/templates/admin/my_account/my_account_profile.html
--- a/kallithea/templates/admin/my_account/my_account_profile.html
+++ b/kallithea/templates/admin/my_account/my_account_profile.html
@@ -20,28 +20,28 @@ ${h.form(url('my_account'), method='post
             <div class="form-group">
                 <label class="control-label" for="username">${_('Username')}:</label>
                 <div class="input">
-                    ${h.text('username',class_='medium', readonly=c.readonly('username'))}
+                    ${h.text('username',class_='form-control', readonly=c.readonly('username'))}
                 </div>
             </div>
 
             <div class="form-group">
                 <label class="control-label" for="firstname">${_('First Name')}:</label>
                 <div class="input">
-                    ${h.text('firstname',class_="medium", readonly=c.readonly('firstname'))}
+                    ${h.text('firstname',class_='form-control', readonly=c.readonly('firstname'))}
                 </div>
             </div>
 
             <div class="form-group">
                 <label class="control-label" for="lastname">${_('Last Name')}:</label>
                 <div class="input">
-                    ${h.text('lastname',class_="medium", readonly=c.readonly('lastname'))}
+                    ${h.text('lastname',class_='form-control', readonly=c.readonly('lastname'))}
                 </div>
             </div>
 
             <div class="form-group">
                 <label class="control-label" for="email">${_('Email')}:</label>
                 <div class="input">
-                    ${h.text('email',class_="medium", readonly=c.readonly('email'))}
+                    ${h.text('email',class_='form-control', readonly=c.readonly('email'))}
                 </div>
             </div>
 
diff --git a/kallithea/templates/admin/permissions/permissions_ips.html b/kallithea/templates/admin/permissions/permissions_ips.html
--- a/kallithea/templates/admin/permissions/permissions_ips.html
+++ b/kallithea/templates/admin/permissions/permissions_ips.html
@@ -29,7 +29,7 @@ ${h.form(url('edit_user_ips_update', id=
                 <label class="control-label" for="new_ip">${_('New IP address')}:</label>
                 <div class="input">
                     ${h.hidden('default_user', 'True')}
-                    ${h.text('new_ip', class_='medium')}
+                    ${h.text('new_ip', class_='form-control')}
                 </div>
             </div>
             <div class="form-group">
diff --git a/kallithea/templates/admin/repo_groups/repo_group_add.html b/kallithea/templates/admin/repo_groups/repo_group_add.html
--- a/kallithea/templates/admin/repo_groups/repo_group_add.html
+++ b/kallithea/templates/admin/repo_groups/repo_group_add.html
@@ -31,21 +31,21 @@
             <div class="form-group">
                 <label class="control-label" for="group_name">${_('Group name')}:</label>
                 <div class="input">
-                    ${h.text('group_name',class_='small')}
+                    ${h.text('group_name',class_='form-control')}
                 </div>
             </div>
 
             <div class="form-group">
                 <label class="control-label" for="group_description">${_('Description')}:</label>
                 <div class="textarea-repo editor">
-                    ${h.textarea('group_description',cols=23,rows=5,class_="medium")}
+                    ${h.textarea('group_description',cols=23,rows=5)}
                 </div>
             </div>
 
             <div class="form-group">
                 <label class="control-label" for="parent_group_id">${_('Group parent')}:</label>
                 <div class="input">
-                    ${h.select('parent_group_id',request.GET.get('parent_group'),c.repo_groups,class_="medium")}
+                    ${h.select('parent_group_id',request.GET.get('parent_group'),c.repo_groups,class_='form-control')}
                 </div>
             </div>
 
diff --git a/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html b/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html
--- a/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html
+++ b/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html
@@ -6,21 +6,21 @@ ${h.form(url('update_repos_group',group_
         <div class="form-group">
             <label class="control-label" for="group_name">${_('Group name')}:</label>
             <div class="input">
-                ${h.text('group_name',class_='medium')}
+                ${h.text('group_name',class_='form-control')}
             </div>
         </div>
 
         <div class="form-group">
             <label class="control-label" for="group_description">${_('Description')}:</label>
             <div class="textarea text-area editor">
-                ${h.textarea('group_description',cols=23,rows=5,class_="medium")}
+                ${h.textarea('group_description',cols=23,rows=5)}
             </div>
         </div>
 
         <div class="form-group">
             <label class="control-label" for="parent_group_id">${_('Group parent')}:</label>
             <div class="input">
-                ${h.select('parent_group_id','',c.repo_groups,class_="medium")}
+                ${h.select('parent_group_id','',c.repo_groups,class_='form-control')}
             </div>
         </div>
 
diff --git a/kallithea/templates/admin/repos/repo_add_base.html b/kallithea/templates/admin/repos/repo_add_base.html
--- a/kallithea/templates/admin/repos/repo_add_base.html
+++ b/kallithea/templates/admin/repos/repo_add_base.html
@@ -7,13 +7,13 @@ ${h.form(url('repos'))}
         <div class="form-group">
             <label class="control-label" for="repo_name">${_('Name')}:</label>
             <div class="input">
-                ${h.text('repo_name',class_="small")}
+                ${h.text('repo_name',class_='form-control')}
             </div>
          </div>
         <div id="remote_clone" class="form-group">
             <label class="control-label" for="clone_uri">${_('Clone remote repository')}:</label>
             <div class="input">
-                ${h.text('clone_uri',class_="small")}
+                ${h.text('clone_uri',class_='form-control')}
                 <span class="help-block">
                     ${_('Optional: URL of a remote repository. If set, the repository will be created as a clone from this URL.')}
                 </span>
@@ -29,7 +29,7 @@ ${h.form(url('repos'))}
         <div class="form-group">
             <label class="control-label" for="repo_group">${_('Repository group')}:</label>
             <div class="input">
-                ${h.select('repo_group',request.GET.get('parent_group'),c.repo_groups,class_="medium")}
+                ${h.select('repo_group',request.GET.get('parent_group'),c.repo_groups,class_='form-control')}
                 <span class="help-block">${_('Optionally select a group to put this repository into.')}</span>
             </div>
         </div>
@@ -43,14 +43,14 @@ ${h.form(url('repos'))}
         <div class="form-group">
             <label class="control-label" for="repo_type">${_('Type')}:</label>
             <div class="input">
-                ${h.select('repo_type','hg',c.backends,class_="small")}
+                ${h.select('repo_type','hg',c.backends,class_='form-control')}
                 <span class="help-block">${_('Type of repository to create.')}</span>
             </div>
         </div>
         <div class="form-group">
             <label class="control-label" for="repo_landing_rev">${_('Landing revision')}:</label>
             <div class="input">
-                ${h.select('repo_landing_rev','',c.landing_revs,class_="medium")}
+                ${h.select('repo_landing_rev','',c.landing_revs,class_='form-control')}
                 <span class="help-block">${_('Default revision for files page, downloads, full text search index and readme generation')}</span>
             </div>
         </div>
diff --git a/kallithea/templates/admin/repos/repo_edit_advanced.html b/kallithea/templates/admin/repos/repo_edit_advanced.html
--- a/kallithea/templates/admin/repos/repo_edit_advanced.html
+++ b/kallithea/templates/admin/repos/repo_edit_advanced.html
@@ -1,7 +1,7 @@
 <h3>${_('Parent')}</h3>
 ${h.form(url('edit_repo_advanced_fork', repo_name=c.repo_info.repo_name))}
 <div class="form">
-       ${h.select('id_fork_of','',c.repos_list,class_="medium")}
+       ${h.select('id_fork_of','',c.repos_list)}
        ${h.submit('set_as_fork_%s' % c.repo_info.repo_name,_('Set'),class_="btn btn-default btn-sm")}
        <div class="field text-muted" style="border:none">
        <ul>
diff --git a/kallithea/templates/admin/repos/repo_edit_fields.html b/kallithea/templates/admin/repos/repo_edit_fields.html
--- a/kallithea/templates/admin/repos/repo_edit_fields.html
+++ b/kallithea/templates/admin/repos/repo_edit_fields.html
@@ -31,21 +31,21 @@
             <div class="form-group">
                 <label class="control-label" for="new_field_key">${_('New field key')}:</label>
                 <div class="input">
-                    ${h.text('new_field_key', class_='small')}
+                    ${h.text('new_field_key', class_='form-control')}
                 </div>
             </div>
 
             <div class="form-group">
                 <label class="control-label" for="new_field_label">${_('New field label')}:</label>
                 <div class="input">
-                    ${h.text('new_field_label', class_='small', placeholder=_('Enter short label'))}
+                    ${h.text('new_field_label', class_='form-control', placeholder=_('Enter short label'))}
                 </div>
             </div>
 
             <div class="form-group">
                 <label class="control-label" for="new_field_desc">${_('New field description')}:</label>
                 <div class="input">
-                    ${h.text('new_field_desc', class_='small', placeholder=_('Enter description of a field'))}
+                    ${h.text('new_field_desc', class_='form-control', placeholder=_('Enter description of a field'))}
                 </div>
             </div>
 
diff --git a/kallithea/templates/admin/repos/repo_edit_settings.html b/kallithea/templates/admin/repos/repo_edit_settings.html
--- a/kallithea/templates/admin/repos/repo_edit_settings.html
+++ b/kallithea/templates/admin/repos/repo_edit_settings.html
@@ -5,7 +5,7 @@ ${h.form(url('update_repo', repo_name=c.
             <div class="form-group">
                 <label class="control-label" for="repo_name">${_('Name')}:</label>
                 <div class="input">
-                    ${h.text('repo_name',class_="medium")}
+                    ${h.text('repo_name',class_='form-control')}
                     <span class="help-block">${_('Permanent Repository ID')}: `_${c.repo_info.repo_id}` <span><a id="show_more_clone_id" href="#">${_('What is that?')}</a></span></span>
                     <span id="clone_id" class="help-block" style="display: none">
                         ${_('URL by id')}: `${c.repo_info.clone_url(with_id=True)}` </br>
@@ -18,7 +18,7 @@ ${h.form(url('update_repo', repo_name=c.
                 <label class="control-label" for="clone_uri">${_('Remote repository')}:</label>
                 <div class="input">
                   <div id="alter_clone_uri">
-                        ${h.text('clone_uri',class_="medium", placeholder=_('Repository URL'))}
+                        ${h.text('clone_uri',class_='form-control', placeholder=_('Repository URL'))}
                         ${h.hidden('clone_uri_hidden', c.repo_info.clone_uri_hidden)}
                   </div>
                   <span id="alter_clone_uri_help_block" class="help-block">
@@ -29,14 +29,14 @@ ${h.form(url('update_repo', repo_name=c.
             <div class="form-group">
                 <label class="control-label" for="repo_group">${_('Repository group')}:</label>
                 <div class="input">
-                    ${h.select('repo_group','',c.repo_groups,class_="medium")}
+                    ${h.select('repo_group','',c.repo_groups,class_='form-control')}
                     <span class="help-block">${_('Optionally select a group to put this repository into.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="repo_landing_rev">${_('Landing revision')}:</label>
                 <div class="input">
-                    ${h.select('repo_landing_rev','',c.landing_revs,class_="medium")}
+                    ${h.select('repo_landing_rev','',c.landing_revs,class_='form-control')}
                     <span class="help-block">${_('Default revision for files page, downloads, whoosh and readme')}</span>
                 </div>
             </div>
@@ -93,7 +93,7 @@ ${h.form(url('update_repo', repo_name=c.
                 <div class="form-group">
                     <label class="control-label" for="${field.field_key_prefixed}">${field.field_label} (${field.field_key}):</label>
                     <div class="input input-medium">
-                        ${h.text(field.field_key_prefixed, field.field_value, class_='medium')}
+                        ${h.text(field.field_key_prefixed, field.field_value, class_='form-control')}
                         %if field.field_desc:
                           <span class="help-block">${field.field_desc}</span>
                         %endif
diff --git a/kallithea/templates/admin/user_groups/user_group_add.html b/kallithea/templates/admin/user_groups/user_group_add.html
--- a/kallithea/templates/admin/user_groups/user_group_add.html
+++ b/kallithea/templates/admin/user_groups/user_group_add.html
@@ -30,7 +30,7 @@
             <div class="form-group">
                 <label class="control-label" for="users_group_name">${_('Group name')}:</label>
                 <div class="input">
-                    ${h.text('users_group_name',class_='small')}
+                    ${h.text('users_group_name',class_='form-control')}
                 </div>
             </div>
             <div class="form-group">
diff --git a/kallithea/templates/admin/user_groups/user_group_edit_settings.html b/kallithea/templates/admin/user_groups/user_group_edit_settings.html
--- a/kallithea/templates/admin/user_groups/user_group_edit_settings.html
+++ b/kallithea/templates/admin/user_groups/user_group_edit_settings.html
@@ -5,7 +5,7 @@ ${h.form(url('update_users_group', id=c.
                 <div class="form-group">
                     <label class="control-label" for="users_group_name">${_('Group name')}:</label>
                     <div class="input">
-                        ${h.text('users_group_name',class_='large')}
+                        ${h.text('users_group_name',class_='form-control')}
                     </div>
                 </div>
                 <div class="form-group">
diff --git a/kallithea/templates/admin/users/user_add.html b/kallithea/templates/admin/users/user_add.html
--- a/kallithea/templates/admin/users/user_add.html
+++ b/kallithea/templates/admin/users/user_add.html
@@ -30,42 +30,42 @@
             <div class="form-group">
                 <label class="control-label" for="username">${_('Username')}:</label>
                 <div class="input">
-                    ${h.text('username',class_='small')}
+                    ${h.text('username',class_='form-control')}
                 </div>
             </div>
 
             <div class="form-group">
                 <label class="control-label" for="password">${_('Password')}:</label>
                 <div class="input">
-                    ${h.password('password',class_='small')}
+                    ${h.password('password',class_='form-control')}
                 </div>
             </div>
 
             <div class="form-group">
                 <label class="control-label" for="password_confirmation">${_('Password confirmation')}:</label>
                 <div class="input">
-                    ${h.password('password_confirmation',class_="small")}
+                    ${h.password('password_confirmation',class_='form-control')}
                 </div>
             </div>
 
             <div class="form-group">
                 <label class="control-label" for="firstname">${_('First Name')}:</label>
                 <div class="input">
-                    ${h.text('firstname',class_='small')}
+                    ${h.text('firstname',class_='form-control')}
                 </div>
             </div>
 
             <div class="form-group">
                 <label class="control-label" for="lastname">${_('Last Name')}:</label>
                 <div class="input">
-                    ${h.text('lastname',class_='small')}
+                    ${h.text('lastname',class_='form-control')}
                 </div>
             </div>
 
             <div class="form-group">
                 <label class="control-label" for="email">${_('Email')}:</label>
                 <div class="input">
-                    ${h.text('email',class_='small')}
+                    ${h.text('email',class_='form-control')}
                 </div>
             </div>
 
diff --git a/kallithea/templates/admin/users/user_edit_api_keys.html b/kallithea/templates/admin/users/user_edit_api_keys.html
--- a/kallithea/templates/admin/users/user_edit_api_keys.html
+++ b/kallithea/templates/admin/users/user_edit_api_keys.html
@@ -59,7 +59,7 @@
             <div class="form-group">
                 <label class="control-label" for="description">${_('New API key')}:</label>
                 <div class="input">
-                    ${h.text('description', class_='medium', placeholder=_('Description'))}
+                    ${h.text('description', class_='form-control', placeholder=_('Description'))}
                     ${h.select('lifetime', '', c.lifetime_options)}
                 </div>
             </div>
diff --git a/kallithea/templates/admin/users/user_edit_emails.html b/kallithea/templates/admin/users/user_edit_emails.html
--- a/kallithea/templates/admin/users/user_edit_emails.html
+++ b/kallithea/templates/admin/users/user_edit_emails.html
@@ -40,7 +40,7 @@
             <div class="form-group">
                 <label class="control-label" for="new_email">${_('New email address')}:</label>
                 <div class="input">
-                    ${h.text('new_email', class_='medium')}
+                    ${h.text('new_email', class_='form-control')}
                 </div>
             </div>
             <div class="form-group">
diff --git a/kallithea/templates/admin/users/user_edit_ips.html b/kallithea/templates/admin/users/user_edit_ips.html
--- a/kallithea/templates/admin/users/user_edit_ips.html
+++ b/kallithea/templates/admin/users/user_edit_ips.html
@@ -40,7 +40,7 @@
             <div class="form-group">
                 <label class="control-label" for="new_ip">${_('New IP address')}:</label>
                 <div class="input">
-                    ${h.text('new_ip', class_='medium')}
+                    ${h.text('new_ip', class_='form-control')}
                 </div>
             </div>
             <div class="form-group">
diff --git a/kallithea/templates/admin/users/user_edit_profile.html b/kallithea/templates/admin/users/user_edit_profile.html
--- a/kallithea/templates/admin/users/user_edit_profile.html
+++ b/kallithea/templates/admin/users/user_edit_profile.html
@@ -22,56 +22,56 @@ ${h.form(url('update_user', id=c.user.us
             <div class="form-group">
                 <label class="control-label" for="username">${_('Username')}:</label>
                 <div class="input">
-                    ${h.text('username',class_='medium', readonly=c.readonly('username'))}
+                    ${h.text('username',class_='form-control', readonly=c.readonly('username'))}
                 </div>
             </div>
 
             <div class="form-group">
                 <label class="control-label" for="email">${_('Email')}:</label>
                 <div class="input">
-                    ${h.text('email',class_='medium', readonly=c.readonly('email'))}
+                    ${h.text('email',class_='form-control', readonly=c.readonly('email'))}
                 </div>
             </div>
 
             <div class="form-group">
                 <label class="control-label" for="extern_type">${_('Source of Record')}:</label>
                 <div class="input">
-                    ${h.text('extern_type',class_='medium',readonly="readonly")}
+                    ${h.text('extern_type',class_='form-control',readonly="readonly")}
                 </div>
             </div>
 
             <div class="form-group">
                 <label class="control-label" for="extern_name">${_('Name in Source of Record')}:</label>
                 <div class="input">
-                    ${h.text('extern_name',class_='medium',readonly="readonly")}
+                    ${h.text('extern_name',class_='form-control',readonly="readonly")}
                 </div>
             </div>
 
             <div class="form-group">
                 <label class="control-label" for="new_password">${_('New password')}:</label>
                 <div class="input">
-                    ${h.password('new_password',class_='medium',readonly=c.readonly('password'))}
+                    ${h.password('new_password',class_='form-control',readonly=c.readonly('password'))}
                 </div>
             </div>
 
             <div class="form-group">
                 <label class="control-label" for="password_confirmation">${_('New password confirmation')}:</label>
                 <div class="input">
-                    ${h.password('password_confirmation',class_="medium",readonly=c.readonly('password'))}
+                    ${h.password('password_confirmation',class_='form-control',readonly=c.readonly('password'))}
                 </div>
             </div>
 
             <div class="form-group">
                 <label class="control-label" for="firstname">${_('First Name')}:</label>
                 <div class="input">
-                    ${h.text('firstname',class_='medium', readonly=c.readonly('firstname'))}
+                    ${h.text('firstname',class_='form-control', readonly=c.readonly('firstname'))}
                 </div>
             </div>
 
             <div class="form-group">
                 <label class="control-label" for="lastname">${_('Last Name')}:</label>
                 <div class="input">
-                    ${h.text('lastname',class_='medium', readonly=c.readonly('lastname'))}
+                    ${h.text('lastname',class_='form-control', readonly=c.readonly('lastname'))}
                 </div>
             </div>
 
diff --git a/kallithea/templates/forks/fork.html b/kallithea/templates/forks/fork.html
--- a/kallithea/templates/forks/fork.html
+++ b/kallithea/templates/forks/fork.html
@@ -25,7 +25,7 @@ ${self.repo_context_bar('createfork')}
             <div class="form-group">
                 <label class="control-label" for="repo_name">${_('Fork name')}:</label>
                 <div class="input">
-                    ${h.text('repo_name',class_="small")}
+                    ${h.text('repo_name',class_='form-control')}
                     ${h.hidden('repo_type',c.repo_info.repo_type)}
                     ${h.hidden('fork_parent_id',c.repo_info.repo_id)}
                 </div>
@@ -42,7 +42,7 @@ ${self.repo_context_bar('createfork')}
             <div class="form-group">
                 <label class="control-label" for="repo_group">${_('Repository group')}:</label>
                 <div class="input">
-                    ${h.select('repo_group','',c.repo_groups,class_="medium")}
+                    ${h.select('repo_group','',c.repo_groups,class_='form-control')}
                     <span class="help-block">${_('Optionally select a group to put this repository into.')}</span>
                 </div>
             </div>
@@ -50,7 +50,7 @@ ${self.repo_context_bar('createfork')}
             <div class="form-group">
                 <label class="control-label" for="landing_rev">${_('Landing revision')}:</label>
                 <div class="input">
-                    ${h.select('landing_rev','',c.landing_revs,class_="medium")}
+                    ${h.select('landing_rev','',c.landing_revs,class_='form-control')}
                     <span class="help-block">${_('Default revision for files page, downloads, whoosh, and readme.')}</span>
                 </div>
             </div>
diff --git a/kallithea/templates/login.html b/kallithea/templates/login.html
--- a/kallithea/templates/login.html
+++ b/kallithea/templates/login.html
@@ -25,14 +25,14 @@
                 <div class="form-group">
                     <label class="control-label col-sm-5" for="username">${_('Username')}:</label>
                     <div class="input col-sm-7">
-                        ${h.text('username',class_='form-control focus large')}
+                        ${h.text('username',class_='form-control focus')}
                     </div>
 
                 </div>
                 <div class="form-group">
                     <label class="control-label col-sm-5" for="password">${_('Password')}:</label>
                     <div class="input col-sm-7">
-                        ${h.password('password',class_='form-control focus large')}
+                        ${h.password('password',class_='form-control focus')}
                     </div>
 
                 </div>
diff --git a/kallithea/templates/pullrequests/pullrequest.html b/kallithea/templates/pullrequests/pullrequest.html
--- a/kallithea/templates/pullrequests/pullrequest.html
+++ b/kallithea/templates/pullrequests/pullrequest.html
@@ -29,7 +29,7 @@ ${self.repo_context_bar('showpullrequest
             <div class="form-group">
                 <label class="control-label" for="pullrequest_title">${_('Title')}:</label>
                 <div class="input">
-                    ${h.text('pullrequest_title',class_="large",placeholder=_('Summarize the changes - or leave empty'))}
+                    ${h.text('pullrequest_title',class_='form-control',placeholder=_('Summarize the changes - or leave empty'))}
                 </div>
             </div>
 
diff --git a/kallithea/templates/pullrequests/pullrequest_show.html b/kallithea/templates/pullrequests/pullrequest_show.html
--- a/kallithea/templates/pullrequests/pullrequest_show.html
+++ b/kallithea/templates/pullrequests/pullrequest_show.html
@@ -50,7 +50,7 @@ ${self.repo_context_bar('showpullrequest
           <div class="field">
               <label for="pullrequest_title">${_('Title')}:</label>
               <div class="input">
-                  ${h.text('pullrequest_title',class_="large",value=c.pull_request.title,placeholder=_('Summarize the changes'))}
+                  ${h.text('pullrequest_title',class_='form-control',value=c.pull_request.title,placeholder=_('Summarize the changes'))}
               </div>
           </div>
 
@@ -143,7 +143,7 @@ ${self.repo_context_bar('showpullrequest
                   <span><a href="mailto:${c.pull_request.owner.email}">${c.pull_request.owner.email}</a></span><br/>
           </div>
           <div class="input pr-do-edit ac" style="display:none">
-               ${h.text('owner', class_="large", value=c.pull_request.owner.username, placeholder=_('Username'))}
+               ${h.text('owner', class_='form-control', value=c.pull_request.owner.username, placeholder=_('Username'))}
                <div id="owner_completion_container"></div>
           </div>
         </div>
diff --git a/kallithea/templates/register.html b/kallithea/templates/register.html
--- a/kallithea/templates/register.html
+++ b/kallithea/templates/register.html
@@ -22,42 +22,42 @@
                 <div class="form-group">
                     <label class="control-label" for="username">${_('Username')}:</label>
                     <div class="input">
-                        ${h.text('username',class_="medium")}
+                        ${h.text('username',class_='form-control')}
                     </div>
                 </div>
 
                 <div class="form-group">
                     <label class="control-label" for="password">${_('Password')}:</label>
                     <div class="input">
-                        ${h.password('password',class_="medium")}
+                        ${h.password('password',class_='form-control')}
                     </div>
                 </div>
 
                 <div class="form-group">
                     <label class="control-label" for="password_confirmation">${_('Re-enter password')}:</label>
                     <div class="input">
-                        ${h.password('password_confirmation',class_="medium")}
+                        ${h.password('password_confirmation',class_='form-control')}
                     </div>
                 </div>
 
                 <div class="form-group">
                     <label class="control-label" for="firstname">${_('First Name')}:</label>
                     <div class="input">
-                        ${h.text('firstname',class_="medium")}
+                        ${h.text('firstname',class_='form-control')}
                     </div>
                 </div>
 
                 <div class="form-group">
                     <label class="control-label" for="lastname">${_('Last Name')}:</label>
                     <div class="input">
-                        ${h.text('lastname',class_="medium")}
+                        ${h.text('lastname',class_='form-control')}
                     </div>
                 </div>
 
                 <div class="form-group">
                     <label class="control-label" for="email">${_('Email')}:</label>
                     <div class="input">
-                        ${h.text('email',class_="medium")}
+                        ${h.text('email',class_='form-control')}
                     </div>
                 </div>
 
diff --git a/kallithea/templates/search/search.html b/kallithea/templates/search/search.html
--- a/kallithea/templates/search/search.html
+++ b/kallithea/templates/search/search.html
@@ -48,7 +48,7 @@ ${self.repo_context_bar('options')}
             <div class="form-group">
                 <label class="control-label" for="q">${_('Search term')}:</label>
                 <div class="input">
-                    ${h.text('q',c.cur_query,class_="small")}
+                    ${h.text('q',c.cur_query,class_='form-control')}
                 </div>
             </div>
 
diff --git a/kallithea/tests/functional/test_search.py b/kallithea/tests/functional/test_search.py
--- a/kallithea/tests/functional/test_search.py
+++ b/kallithea/tests/functional/test_search.py
@@ -9,7 +9,7 @@ class TestSearchController(TestControlle
         self.log_user()
         response = self.app.get(url(controller='search', action='index'))
 
-        response.mustcontain('class="small" id="q" name="q" type="text"')
+        response.mustcontain('class="form-control" id="q" name="q" type="text"')
         # Test response...
 
     def test_empty_search(self, tmpdir):