diff --git a/admin/templates/setting.mustache b/admin/templates/setting.mustache
index 9881bbccc02..f7f2c568e40 100644
--- a/admin/templates/setting.mustache
+++ b/admin/templates/setting.mustache
@@ -13,34 +13,6 @@
 
     You should have received a copy of the GNU General Public License
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-}}{{!
-    @template core_admin/setting
-
-    Admin setting template.
-
-    Context variables required for this template:
-    * labelfor - id of the form element
-    * title - Setting title
-    * override - Overridden message
-    * warning - Warning message
-    * name - Setting name
-    * error - Error message
-    * element - The Element HTML
-    * forceltr - Force this element to be displayed LTR
-    * default - Default value
-
-    Example context (json):
-    {
-        "title": "Setting title",
-        "labelfor": "id0",
-        "override": "Overidden",
-        "warning": "Warning",
-        "name": "Name",
-        "error": "Error",
-        "element": "Raw HTML",
-        "forceltr": false,
-        "default": "Default value"
-    }
 }}
 {{!
     @template core_admin/setting
@@ -71,8 +43,11 @@
         "default": "Default value"
     }
 }}
-<div class="form-item clearfix" id="{{id}}">
-    <div class="form-label">
+{{!
+    Setting.
+}}
+<div class="form-item row" id="{{id}}">
+    <div class="form-label col-sm-3 text-sm-right">
         <label {{#labelfor}}for="{{labelfor}}"{{/labelfor}}>
             {{{title}}}
             {{#override}}
@@ -82,16 +57,16 @@
                 <div class="form-warning">{{warning}}</div>
             {{/warning}}
         </label>
-        <span class="form-shortname">{{{name}}}</span>
+        <span class="form-shortname d-block small text-muted">{{{name}}}</span>
     </div>
-    <div class="form-setting">
+    <div class="form-setting col-sm-9">
         {{#error}}
             <div><span class="error">{{error}}</span></div>
         {{/error}}
         {{{element}}}
         {{#default}}
-            <div class="form-defaultinfo {{#forceltr}}text-ltr{{/forceltr}}">{{{default}}}</div>
+            <div class="form-defaultinfo text-muted {{#forceltr}}text-ltr{{/forceltr}}">{{{default}}}</div>
         {{/default}}
+        <div class="form-description mt-3">{{{description}}}</div>
     </div>
-    <div class="form-description">{{{description}}}</div>
 </div>
diff --git a/admin/templates/setting_configcolourpicker.mustache b/admin/templates/setting_configcolourpicker.mustache
index c1503f8d17a..3de5aac311d 100644
--- a/admin/templates/setting_configcolourpicker.mustache
+++ b/admin/templates/setting_configcolourpicker.mustache
@@ -13,26 +13,6 @@
 
     You should have received a copy of the GNU General Public License
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-}}{{!
-    @template core_admin/setting_configcolourpicker
-
-    Admin setting colour picker template.
-
-    Context variables required for this template:
-    * icon - optional icon context (see pix_icon)
-    * name - element name
-    * id - element id
-    * value - element value
-    * haspreviewconfig - show preview of selected color
-
-    Example context (json):
-    {
-        "icon": false,
-        "name": "name0",
-        "id": "id0",
-        "value": "#555655",
-        "haspreviewconfig": false
-    }
 }}
 {{!
     @template core_admin/setting_configcolourpicker
@@ -55,13 +35,16 @@
         "haspreviewconfig": false
     }
 }}
+{{!
+    Setting configcolourpicker.
+}}
 <div class="form-colourpicker defaultsnext">
     <div class="admin_colourpicker clearfix">
         {{#icon}}
             {{>core/pix_icon}}
         {{/icon}}
     </div>
-    <input type="text" name="{{name}}" id="{{id}}" value="{{value}}" size="12" class="text-ltr">
+    <input type="text" name="{{name}}" id="{{id}}" value="{{value}}" size="12" class="form-control text-ltr">
     {{#haspreviewconfig}}
         <input type="button" id="{{id}}_preview" value={{#quote}}{{#str}}preview{{/str}}{{/quote}} class="admin_colourpicker_preview">
     {{/haspreviewconfig}}
diff --git a/admin/templates/setting_configduration.mustache b/admin/templates/setting_configduration.mustache
index bc66bbe8145..d2faa4ae953 100644
--- a/admin/templates/setting_configduration.mustache
+++ b/admin/templates/setting_configduration.mustache
@@ -13,24 +13,6 @@
 
     You should have received a copy of the GNU General Public License
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-}}{{!
-    @template core_admin/setting_configduration
-
-    Admin duration setting template.
-
-    Context variables required for this template:
-    * name - form element name
-    * options - list of options for units containing name, value, selected
-    * value - yes
-    * id - element id
-
-    Example context (json):
-    {
-        "name": "test",
-        "value": "5",
-        "id": "test0",
-        "options": [ { "name": "Minutes", "value": "mins", "selected": true } ]
-    }
 }}
 {{!
     @template core_admin/setting_configduration
@@ -51,13 +33,18 @@
         "options": [ { "name": "Minutes", "value": "mins", "selected": true } ]
     }
 }}
+{{!
+    Setting configduration.
+}}
 <div class="form-duration defaultsnext">
-    <input type="text" size="5" id="{{id}}v" name="{{name}}[v]" value="{{value}}" class="text-ltr">
-    <label class="accesshide" for="{{id}}u">{{#str}}durationunits, admin{{/str}}</label>
-    <select id="{{id}}u" name="{{name}}[u]">
-        {{#options}}
-            <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
-        {{/options}}
-    </select>
+    <div class="form-inline">
+        <input type="text" size="5" id="{{id}}v" name="{{name}}[v]" value="{{value}}" class="form-control text-ltr">
+        <label class="sr-only" for="{{id}}u">{{#str}}durationunits, admin{{/str}}</label>
+        <select id="{{id}}u" name="{{name}}[u]" class="form-control">
+            {{#options}}
+                <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
+            {{/options}}
+        </select>
+    </div>
 </div>
 
diff --git a/admin/templates/setting_configfile.mustache b/admin/templates/setting_configfile.mustache
index b7d71cb9ad9..1f0b5d5d6b8 100644
--- a/admin/templates/setting_configfile.mustache
+++ b/admin/templates/setting_configfile.mustache
@@ -13,29 +13,6 @@
 
     You should have received a copy of the GNU General Public License
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-}}{{!
-    @template core_admin/setting_configfile
-
-    Admin file setting template.
-
-    Context variables required for this template:
-    * name - form element name
-    * id - element id
-    * size - size of the field
-    * readonly - Make the field readonly
-    * value - value
-    * showvalidity - Show a green check if the path is readable
-    * valid - True if the path is readable
-
-    Example context (json):
-    {
-        "name": "test",
-        "value": "/my-super-secret-path/file",
-        "id": "test0",
-        "readonly": true,
-        "showvalidity": true,
-        "valid": false
-    }
 }}
 {{!
     @template core_admin/setting_configfile
@@ -61,15 +38,20 @@
         "valid": false
     }
 }}
+{{!
+    Setting configfile.
+}}
 <div class="form-file defaultsnext">
-    <input type="text" name="{{name}}" id="{{id}}" size="{{size}}" value="{{value}}" class="text-ltr" {{#readonly}}readonly{{/readonly}}>
-    {{#showvalidity}}
-        {{#valid}}
-            <span class="pathok">&#x2714;</span>
-        {{/valid}}
-        {{^valid}}
-            <span class="patherror">&#x2718;</span>
-        {{/valid}}
-    {{/showvalidity}}
+    <div class="form-inline">
+        <input type="text" name="{{name}}" id="{{id}}" size="{{size}}" value="{{value}}" class="form-control text-ltr" {{#readonly}}readonly{{/readonly}}>
+        {{#showvalidity}}
+            {{#valid}}
+                <span class="text-success">&#x2714;</span>
+            {{/valid}}
+            {{^valid}}
+                <span class="text-danger">&#x2718;</span>
+            {{/valid}}
+        {{/showvalidity}}
+    </div>
 </div>
 
diff --git a/admin/templates/setting_configmultiselect.mustache b/admin/templates/setting_configmultiselect.mustache
index ce866e9abed..49eb55c1e74 100644
--- a/admin/templates/setting_configmultiselect.mustache
+++ b/admin/templates/setting_configmultiselect.mustache
@@ -13,25 +13,6 @@
 
     You should have received a copy of the GNU General Public License
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-}}{{!
-    @template core_admin/setting_configmultiselect
-
-    Admin multiselect setting template.
-
-    Context variables required for this template:
-    * name - form element name
-    * id - element id
-    * size - element size
-    * options - list of options containing name, value, selected
-
-    Example context (json):
-    {
-        "name": "test",
-        "id": "test0",
-        "size": "3",
-        "options": [ { "name": "Option 1", "value": "V", "selected": true },
-                     { "name": "Option 2", "value": "V", "selected": true } ]
-    }
 }}
 {{!
     @template core_admin/setting_configmultiselect
@@ -53,9 +34,12 @@
                      { "name": "Option 2", "value": "V", "selected": true } ]
     }
 }}
+{{!
+    Setting configmultiselect.
+}}
 <div class="form-select">
     <input type="hidden" name="{{name}}[xxxxx]" value="1">
-    <select id="{{id}}" name="{{name}}[]" size="{{size}}" multiple>
+    <select id="{{id}}" name="{{name}}[]" size="{{size}}" class="form-control" multiple>
         {{#options}}
             <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
         {{/options}}
diff --git a/admin/templates/setting_configmultiselect_optgroup.mustache b/admin/templates/setting_configmultiselect_optgroup.mustache
index cff46fdab77..20d66e1226c 100644
--- a/admin/templates/setting_configmultiselect_optgroup.mustache
+++ b/admin/templates/setting_configmultiselect_optgroup.mustache
@@ -13,44 +13,6 @@
 
     You should have received a copy of the GNU General Public License
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-}}{{!
-    @template core_admin/setting_configmultiselect_optgroup
-
-    Admin multiselect setting template with optgroup support.
-
-    Context variables required for this template:
-    * name - form element name
-    * id - element id
-    * size - element size
-    * options - list of options not grouped
-    * optgroups - list of options grouped containing the group label and for each option: name, value, selected
-
-    Example context (json):
-    {
-        "name": "test",
-        "id": "test0",
-        "size": "3",
-        "options": [
-            { "name": "Option 1", "value": "V", "selected": false },
-            { "name": "Option 2", "value": "V", "selected": true }
-        ],
-        "optgroups": [
-            {
-                "label": "Group 1",
-                "options": [
-                    { "name": "Option 3", "value": "V", "selected": false },
-                    { "name": "Option 4", "value": "V", "selected": true }
-                ]
-            },
-            {
-                "label": "Group 2",
-                "options": [
-                    { "name": "Option 5", "value": "V", "selected": false },
-                    { "name": "Option 6", "value": "V", "selected": true }
-                ]
-            }
-        ]
-    }
 }}
 {{!
     @template core_admin/setting_configmultiselect_optgroup
@@ -91,13 +53,16 @@
         ]
     }
 }}
+{{!
+    Setting configmultiselect with optgroup support.
+}}
 <div class="form-select">
     <input type="hidden" name="{{name}}[xxxxx]" value="1">
-    <select id="{{id}}" name="{{name}}[]" size="{{size}}" multiple>
-        {{#options}}
-            <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
-        {{/options}}
-        {{#optgroups}}
+    <select id="{{id}}" name="{{name}}[]" size="{{size}}" class="form-control" multiple>
+    {{#options}}
+        <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
+    {{/options}}
+    {{#optgroups}}
             <optgroup label="{{label}}">
                 {{#options}}
                     <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
diff --git a/admin/templates/setting_configselect.mustache b/admin/templates/setting_configselect.mustache
index 18e92136941..9b6c6e1f793 100644
--- a/admin/templates/setting_configselect.mustache
+++ b/admin/templates/setting_configselect.mustache
@@ -13,25 +13,6 @@
 
     You should have received a copy of the GNU General Public License
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-}}{{!
-    @template core_admin/setting_configselect
-
-    Admin select setting template.
-
-    Context variables required for this template:
-    * name - form element name
-    * id - element id
-    * options - list of options containing name, value, selected
-
-    Example context (json):
-    {
-        "name": "test",
-        "id": "test0",
-        "options": [
-            { "name": "Option 1", "value": "V", "selected": true },
-            { "name": "Option 2", "value": "V", "selected": true }
-        ]
-    }
 }}
 {{!
     @template core_admin/setting_configselect
@@ -53,8 +34,11 @@
         ]
     }
 }}
+{{!
+    Setting configselect.
+}}
 <div class="form-select defaultsnext">
-    <select id="{{id}}" name="{{name}}">
+    <select id="{{id}}" name="{{name}}" class="custom-select">
         {{#options}}
             <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
         {{/options}}
diff --git a/admin/templates/setting_configselect_optgroup.mustache b/admin/templates/setting_configselect_optgroup.mustache
index aeb794bf7bd..95f818baa7e 100644
--- a/admin/templates/setting_configselect_optgroup.mustache
+++ b/admin/templates/setting_configselect_optgroup.mustache
@@ -13,42 +13,6 @@
 
     You should have received a copy of the GNU General Public License
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-}}{{!
-    @template core_admin/setting_configselect_optgroup
-
-    Admin select with optgroup setting template.
-
-    Context variables required for this template:
-    * name - form element name
-    * id - element id
-    * options - list of options (not grouped)
-    * optgroups - list of options grouped containing the group label and for each option: name, value, selected
-
-    Example context (json):
-    {
-        "name": "test",
-        "id": "test0",
-        "options": [
-            { "name": "Option 1", "value": "V", "selected": false },
-            { "name": "Option 2", "value": "V", "selected": false }
-        ],
-        "optgroups": [
-            {
-                "label": "Group 1",
-                "options": [
-                    { "name": "Option 3", "value": "V", "selected": true },
-                    { "name": "Option 4", "value": "V", "selected": false }
-                ]
-            },
-            {
-                "label": "Group 2",
-                "options": [
-                    { "name": "Option 5", "value": "V", "selected": false },
-                    { "name": "Option 6", "value": "V", "selected": false }
-                ]
-            }
-        ]
-    }
 }}
 {{!
     @template core_admin/setting_configselect_optgroup
@@ -87,8 +51,11 @@
         ]
     }
 }}
+{{!
+    Setting configselect with optgroup support.
+}}
 <div class="form-select defaultsnext">
-    <select id="{{id}}" name="{{name}}">
+    <select id="{{id}}" name="{{name}}" class="custom-select">
         {{#options}}
             <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
         {{/options}}
@@ -102,3 +69,4 @@
     </select>
 </div>
 
+
diff --git a/admin/templates/setting_configtext.mustache b/admin/templates/setting_configtext.mustache
index b41893c93c7..a31f73a3355 100644
--- a/admin/templates/setting_configtext.mustache
+++ b/admin/templates/setting_configtext.mustache
@@ -13,28 +13,6 @@
 
     You should have received a copy of the GNU General Public License
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-}}{{!
-    @template core_admin/setting_configtext
-
-    Admin text setting template.
-
-    Context variables required for this template:
-    * name - form element name
-    * id - element id
-    * value - element value
-    * size - element size
-    * forceltr - always display as ltr
-    * attributes - list of additional attributes containing name, value
-
-    Example context (json):
-    {
-        "name": "test",
-        "id": "test0",
-        "value": "A tall, dark stranger will have more fun than you.",
-        "size": "21",
-        "forceltr": false,
-        "attributes": [ { "name": "readonly", "value": "readonly" } ]
-    }
 }}
 {{!
     @template core_admin/setting_configtext
@@ -59,6 +37,9 @@
         "attributes": [ { "name": "readonly", "value": "readonly" } ]
     }
 }}
+{{!
+    Setting configtext.
+}}
 <div class="form-text defaultsnext">
-    <input type="text" name="{{name}}" value="{{value}}" size="{{size}}" id="{{id}}" class="{{#forceltr}}text-ltr{{/forceltr}}"{{#attributes}} {{name}}="{{value}}"{{/attributes}}>
+    <input type="text" name="{{name}}" value="{{value}}" size="{{size}}" id="{{id}}" class="form-control {{#forceltr}}text-ltr{{/forceltr}}">
 </div>
diff --git a/admin/templates/setting_configtextarea.mustache b/admin/templates/setting_configtextarea.mustache
index 1eee2ffcf95..002b0cd7e2d 100644
--- a/admin/templates/setting_configtextarea.mustache
+++ b/admin/templates/setting_configtextarea.mustache
@@ -13,27 +13,6 @@
 
     You should have received a copy of the GNU General Public License
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-}}{{!
-    @template core_admin/setting_configtextarea
-
-    Admin textarea setting template.
-
-    Context variables required for this template:
-    * name - form element name
-    * id - element id
-    * rows - number of rows
-    * cols - number of cols
-    * value - default value
-    * forceltr - always display as ltr
-
-    Example context (json):
-    {
-        "name": "test",
-        "cols": "30",
-        "rows": "3",
-        "value": "Excellent day for putting Slinkies on an escalator.",
-        "id": "test0"
-    }
 }}
 {{!
     @template core_admin/setting_configtextarea
@@ -57,6 +36,9 @@
         "id": "test0"
     }
 }}
+{{!
+    Setting configtextarea.
+}}
 <div class="form-textarea">
-    <textarea rows="{{rows}}" cols="{{cols}}" id="{{id}}" name="{{name}}" spellcheck="true" class="{{#forceltr}}text-ltr{{/forceltr}}">{{value}}</textarea>
+    <textarea rows="{{rows}}" cols="{{cols}}" id="{{id}}" name="{{name}}" spellcheck="true" class="form-control {{#forceltr}}text-ltr{{/forceltr}}">{{value}}</textarea>
 </div>
diff --git a/admin/templates/setting_configtime.mustache b/admin/templates/setting_configtime.mustache
index 69c5a79d22f..90d37b325d5 100644
--- a/admin/templates/setting_configtime.mustache
+++ b/admin/templates/setting_configtime.mustache
@@ -13,30 +13,6 @@
 
     You should have received a copy of the GNU General Public License
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-}}{{!
-    @template core_admin/setting_configtime
-
-    Admin time setting template.
-
-    Context variables required for this template:
-    * name - form element name
-    * id - element id
-    * hours - list of valid hour options containing name, value, selected
-    * minutes - list of valid minute options containing name, value, selected
-
-    Example context (json):
-    {
-        "name": "test",
-        "id": "test0",
-        "minutes": [
-            { "name": "00", "value": "0", "selected": true },
-            { "name": "01", "value": "1", "selected": false }
-        ],
-        "hours": [
-            { "name": "1", "value": "1", "selected": true },
-            { "name": "2", "value": "2", "selected": false }
-        ]
-    }
 }}
 {{!
     @template core_admin/setting_configtime
@@ -63,18 +39,23 @@
         ]
     }
 }}
-<div class="form-time defaultsnext text-ltr">
-    <label class="accesshide" for="{{id}}h">{{#str}}hours{{/str}}</label>
-    <select id="{{id}}h" name="{{name}}[h]">
-        {{#hours}}
-            <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
-        {{/hours}}
-    </select>:
-    <label class="accesshide" for="{{id}}m">{{#str}}minutes{{/str}}</label>
-    <select id="{{id}}m" name="{{name}}[m]">
-        {{#minutes}}
-            <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
-        {{/minutes}}
-    </select>
+{{!
+    Setting configtime.
+}}
+<div class="form-time defaultsnext">
+    <div class="form-inline text-ltr">
+        <label class="sr-only" for="{{id}}h">{{#str}}hours{{/str}}</label>
+        <select id="{{id}}h" name="{{name}}[h]" class="custom-select">
+            {{#hours}}
+                <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
+            {{/hours}}
+        </select>:
+        <label class="sr-only" for="{{id}}m">{{#str}}minutes{{/str}}</label>
+        <select id="{{id}}m" name="{{name}}[m]" class="custom-select">
+            {{#minutes}}
+                <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
+            {{/minutes}}
+        </select>
+    </div>
 </div>
 
diff --git a/admin/templates/setting_courselist_frontpage.mustache b/admin/templates/setting_courselist_frontpage.mustache
index 3a3603054a4..ef89725be44 100644
--- a/admin/templates/setting_courselist_frontpage.mustache
+++ b/admin/templates/setting_courselist_frontpage.mustache
@@ -13,28 +13,6 @@
 
     You should have received a copy of the GNU General Public License
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-}}{{!
-    @template core_admin/setting_courselist_frontpage
-
-    Admin courselist_frontpage setting template.
-
-    Context variables required for this template:
-    * selects list of select objects containing id, name, key and options.
-      options is another nested list of items containing name, value and selected
-
-    Example context (json):
-    {
-        "selects": [
-            {
-                "id": "i1",
-                "name": "s1",
-                "key": "k1",
-                "options": [
-                    { "name": "Fish", "value": "snapper", "selected": true }
-                ]
-            }
-        ]
-    }
 }}
 {{!
     @template core_admin/setting_courselist_frontpage
@@ -59,9 +37,12 @@
         ]
     }
 }}
+{{!
+    Setting courselist_frontpage.
+}}
 <div class="form-group">
     {{#selects}}
-        <select id="{{id}}{{key}}" name="{{name}}[]" class="form-select">
+        <select id="{{id}}{{key}}" name="{{name}}[]" class="custom-select">
             {{#options}}
                 <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
             {{/options}}
diff --git a/admin/templates/setting_description.mustache b/admin/templates/setting_description.mustache
index c6d0e57b1b2..09bda33e17b 100644
--- a/admin/templates/setting_description.mustache
+++ b/admin/templates/setting_description.mustache
@@ -34,12 +34,13 @@
 {{!
     Setting description.
 }}
-<div class="form-item form-horizontal clearfix">
-    <div class="form-label">
+<div class="form-item row">
+    <div class="form-label col-sm-3 text-sm-right">
         <label>
             {{{title}}}
         </label>
-        <span class="form-shortname ">{{{name}}}</span>
     </div>
-    <div class="controls felement fstatic">{{{description}}}</div>
-</div>
\ No newline at end of file
+    <div class="form-setting col-sm-9">
+        <div class="form-description">{{{description}}}</div>
+    </div>
+</div>
diff --git a/admin/templates/setting_devicedetectregex.mustache b/admin/templates/setting_devicedetectregex.mustache
index e4bea2317d6..97f97f250ef 100644
--- a/admin/templates/setting_devicedetectregex.mustache
+++ b/admin/templates/setting_devicedetectregex.mustache
@@ -13,20 +13,6 @@
 
     You should have received a copy of the GNU General Public License
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-}}{{!
-    @template core_admin/setting_devicedetectregex
-
-    Admin devicedetectregex setting template.
-
-    Context variables required for this template:
-    * expressions - List of expressions containing index, name, expression and value
-
-    Example context (json):
-    {
-        "expressions": [
-            { "index": "i1", "name": "Name", "expression": "/bird|yellow/", "value": "Canary" }
-        ]
-    }
 }}
 {{!
     @template core_admin/setting_devicedetectregex
@@ -43,7 +29,10 @@
         ]
     }
 }}
-<table class="generaltable">
+{{!
+    Setting devicedetectregex.
+}}
+<table class="table table-striped">
     <thead>
         <tr>
             <th>{{#str}}devicedetectregexexpression, admin{{/str}}</th>
@@ -54,10 +43,10 @@
         {{#expressions}}
             <tr>
                 <td class="c{{index}}">
-                    <input type="text" name="{{name}}[expression{{index}}]" class="form-text text-ltr" value="{{expression}}">
+                    <input type="text" name="{{name}}[expression{{index}}]" class="form-control" value="{{expression}}">
                 </td>
                 <td class="c{{index}}">
-                    <input type="text" name="{{name}}[value{{index}}]" class="form-text text-ltr" value="{{value}}">
+                    <input type="text" name="{{name}}[value{{index}}]" class="form-control" value="{{value}}">
                 </td>
             </tr>
         {{/expressions}}
diff --git a/admin/templates/setting_emoticons.mustache b/admin/templates/setting_emoticons.mustache
index 072e1a7c1d4..8a245ddcbbd 100644
--- a/admin/templates/setting_emoticons.mustache
+++ b/admin/templates/setting_emoticons.mustache
@@ -13,23 +13,6 @@
 
     You should have received a copy of the GNU General Public License
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-}}{{!
-    @template core_admin/setting_emoticons
-
-    Admin emoticons setting template.
-
-    Context variables required for this template:
-    * name - form element name
-    * id - element id
-
-    Example context (json):
-    {
-        "emoticons": [
-            { "fields": [
-                { "name": "Smile", "field": "f1", "value": ":)" }
-            ]}
-        ]
-    }
 }}
 {{!
     @template core_admin/setting_emoticons
@@ -49,6 +32,9 @@
         ]
     }
 }}
+{{!
+    Setting emoticons.
+}}
 <div class="form-group">
     <table id="emoticonsetting" class="admintable generaltable">
         <thead>
@@ -65,7 +51,7 @@
                 <tr>
                     {{#fields}}
                         <td class="c{{index}}">
-                            <input type="text" name="{{name}}[{{field}}]" class="form-text text-ltr" value="{{value}}">
+                            <input type="text" name="{{name}}[{{field}}]" class="form-text form-control text-ltr" value="{{value}}">
                         </td>
                     {{/fields}}
                     <td>
diff --git a/admin/templates/setting_gradecat_combo.mustache b/admin/templates/setting_gradecat_combo.mustache
index d2ab931094d..9e71c27f29b 100644
--- a/admin/templates/setting_gradecat_combo.mustache
+++ b/admin/templates/setting_gradecat_combo.mustache
@@ -13,28 +13,6 @@
 
     You should have received a copy of the GNU General Public License
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-}}{{!
-    @template core_admin/setting_gradecat_combo
-
-    Admin gradecat_combo setting template.
-
-    Context variables required for this template:
-    * name - form element name
-    * id - element id
-    * options - list of options containing name, value and selected
-    * forced - is it forced
-    * advanced - is it advanced
-
-    Example context (json):
-    {
-        "name": "test",
-        "id": "test0",
-        "options": [
-            { "name": "Option name", "value": "Value", "selected": true }
-        ],
-        "forced": true,
-        "advanced": true
-    }
 }}
 {{!
     @template core_admin/setting_gradecat_combo
@@ -59,8 +37,11 @@
         "advanced": true
     }
 }}
+{{!
+    Setting configselect.
+}}
 <div class="form-group">
-    <select id="{{id}}" name="{{name}}[value]" class="form-select">
+    <select id="{{id}}" name="{{name}}[value]" class="form-select custom-select">
         {{#options}}
             <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
         {{/options}}
diff --git a/admin/templates/settings.mustache b/admin/templates/settings.mustache
index b8694e8512c..0067f8e4564 100644
--- a/admin/templates/settings.mustache
+++ b/admin/templates/settings.mustache
@@ -13,27 +13,6 @@
 
     You should have received a copy of the GNU General Public License
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-}}{{!
-    @template core_admin/settings
-
-    Admin settings form template.
-
-    Context variables required for this template:
-    * actionurl - url to submit to
-    * params - list of parameters containing name and value
-    * return - page to return to
-    * title - form title
-    * settings - raw html for settings
-    * showsave - true if we need save buttons
-
-    Example context (json):
-    {
-        "actionurl": "/",
-        "return": "/",
-        "title": "Settings Form",
-        "settings": "RAW HTML",
-        "showsave": true
-    }
 }}
 {{!
     @template core_admin/settings
@@ -57,8 +36,11 @@
         "showsave": true
     }
 }}
+{{!
+    Settings.
+}}
 <form action="{{actionurl}}" method="post" id="adminsettings">
-    <div class="settingsform clearfix">
+    <div class="settingsform">
         {{#params}}
             <input type="hidden" name="{{name}}" value="{{value}}">
             <input type="hidden" name="action" value="save-settings">
@@ -70,8 +52,10 @@
         {{/title}}
         {{{settings}}}
         {{#showsave}}
-            <div class="form-buttons">
-                <input type="submit" class="form-submit" value={{#quote}}{{#str}}savechanges, admin{{/str}}{{/quote}}>
+            <div class="row">
+                <div class="offset-sm-3 col-sm-3">
+                    <button type="submit" class="btn btn-primary">{{#str}}savechanges, admin{{/str}}</button>
+                </div>
             </div>
         {{/showsave}}
     </div>
diff --git a/admin/templates/settings_search_results.mustache b/admin/templates/settings_search_results.mustache
index df82b0ff616..66531548b66 100644
--- a/admin/templates/settings_search_results.mustache
+++ b/admin/templates/settings_search_results.mustache
@@ -58,8 +58,10 @@
                 </fieldset>
             {{/results}}
             {{#showsave}}
-                <div class="form-buttons">
-                    <input type="submit" class="form-submit" value={{#quote}}{{#str}}savechanges, admin{{/str}}{{/quote}}>
+                <div class="row">
+                    <div class="offset-sm-3 col-sm-3">
+                        <button type="submit" class="btn btn-primary">{{#str}}savechanges, admin{{/str}}</button>
+                    </div>
                 </div>
             {{/showsave}}
         {{/hasresults}}
diff --git a/theme/boost/templates/core_admin/setting_configduration.mustache b/theme/boost/templates/core_admin/setting_configduration.mustache
deleted file mode 100644
index 50c355d267f..00000000000
--- a/theme/boost/templates/core_admin/setting_configduration.mustache
+++ /dev/null
@@ -1,31 +0,0 @@
-{{!
-    This file is part of Moodle - http://moodle.org/
-
-    Moodle is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Moodle is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-}}
-{{!
-    Setting configduration.
-}}
-<div class="form-duration defaultsnext">
-    <div class="form-inline">
-        <input type="text" size="5" id="{{id}}v" name="{{name}}[v]" value="{{value}}" class="form-control text-ltr">
-        <label class="sr-only" for="{{id}}u">{{#str}}durationunits, admin{{/str}}</label>
-        <select id="{{id}}u" name="{{name}}[u]" class="form-control">
-            {{#options}}
-                <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
-            {{/options}}
-        </select>
-    </div>
-</div>
-
diff --git a/theme/boost/templates/core_admin/setting_configfile.mustache b/theme/boost/templates/core_admin/setting_configfile.mustache
deleted file mode 100644
index d382a8a6af4..00000000000
--- a/theme/boost/templates/core_admin/setting_configfile.mustache
+++ /dev/null
@@ -1,33 +0,0 @@
-{{!
-    This file is part of Moodle - http://moodle.org/
-
-    Moodle is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Moodle is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-}}
-{{!
-    Setting configfile.
-}}
-<div class="form-file defaultsnext">
-    <div class="form-inline">
-        <input type="text" name="{{name}}" id="{{id}}" size="{{size}}" value="{{value}}" class="form-control text-ltr" {{#readonly}}readonly{{/readonly}}>
-        {{#showvalidity}}
-            {{#valid}}
-                <span class="text-success">&#x2714;</span>
-            {{/valid}}
-            {{^valid}}
-                <span class="text-danger">&#x2718;</span>
-            {{/valid}}
-        {{/showvalidity}}
-    </div>
-</div>
-
diff --git a/theme/boost/templates/core_admin/setting_configmultiselect_optgroup.mustache b/theme/boost/templates/core_admin/setting_configmultiselect_optgroup.mustache
deleted file mode 100644
index 6398e7550c1..00000000000
--- a/theme/boost/templates/core_admin/setting_configmultiselect_optgroup.mustache
+++ /dev/null
@@ -1,35 +0,0 @@
-{{!
-    This file is part of Moodle - http://moodle.org/
-
-    Moodle is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Moodle is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-}}
-{{!
-    Setting configmultiselect with optgroup support.
-}}
-<div class="form-select">
-    <input type="hidden" name="{{name}}[xxxxx]" value="1">
-    <select id="{{id}}" name="{{name}}[]" size="{{size}}" class="form-control" multiple>
-    {{#options}}
-        <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
-    {{/options}}
-    {{#optgroups}}
-            <optgroup label="{{label}}">
-                {{#options}}
-                    <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
-                {{/options}}
-            </optgroup>
-        {{/optgroups}}
-    </select>
-</div>
-
diff --git a/theme/boost/templates/core_admin/setting_configtime.mustache b/theme/boost/templates/core_admin/setting_configtime.mustache
deleted file mode 100644
index b8e966649b1..00000000000
--- a/theme/boost/templates/core_admin/setting_configtime.mustache
+++ /dev/null
@@ -1,36 +0,0 @@
-{{!
-    This file is part of Moodle - http://moodle.org/
-
-    Moodle is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Moodle is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-}}
-{{!
-    Setting configtime.
-}}
-<div class="form-time defaultsnext">
-    <div class="form-inline text-ltr">
-        <label class="sr-only" for="{{id}}h">{{#str}}hours{{/str}}</label>
-        <select id="{{id}}h" name="{{name}}[h]" class="custom-select">
-            {{#hours}}
-                <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
-            {{/hours}}
-        </select>:
-        <label class="sr-only" for="{{id}}m">{{#str}}minutes{{/str}}</label>
-        <select id="{{id}}m" name="{{name}}[m]" class="custom-select">
-            {{#minutes}}
-                <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
-            {{/minutes}}
-        </select>
-    </div>
-</div>
-
diff --git a/theme/boost/templates/core_admin/setting.mustache b/theme/bootstrapbase/templates/core_admin/setting.mustache
similarity index 53%
rename from theme/boost/templates/core_admin/setting.mustache
rename to theme/bootstrapbase/templates/core_admin/setting.mustache
index 32151be80e0..ed172466eba 100644
--- a/theme/boost/templates/core_admin/setting.mustache
+++ b/theme/bootstrapbase/templates/core_admin/setting.mustache
@@ -15,10 +15,36 @@
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 }}
 {{!
-    Setting.
+    @template core_admin/setting
+
+    Admin setting template.
+
+    Context variables required for this template:
+    * labelfor - id of the form element
+    * title - Setting title
+    * override - Overridden message
+    * warning - Warning message
+    * name - Setting name
+    * error - Error message
+    * element - The Element HTML
+    * forceltr - Force this element to be displayed LTR
+    * default - Default value
+
+    Example context (json):
+    {
+        "title": "Setting title",
+        "labelfor": "id0",
+        "override": "Overidden",
+        "warning": "Warning",
+        "name": "Name",
+        "error": "Error",
+        "element": "Raw HTML",
+        "forceltr": false,
+        "default": "Default value"
+    }
 }}
-<div class="form-item row" id="{{id}}">
-    <div class="form-label col-sm-3 text-sm-right">
+<div class="form-item clearfix" id="{{id}}">
+    <div class="form-label">
         <label {{#labelfor}}for="{{labelfor}}"{{/labelfor}}>
             {{{title}}}
             {{#override}}
@@ -28,16 +54,16 @@
                 <div class="form-warning">{{warning}}</div>
             {{/warning}}
         </label>
-        <span class="form-shortname d-block small text-muted">{{{name}}}</span>
+        <span class="form-shortname">{{{name}}}</span>
     </div>
-    <div class="form-setting col-sm-9">
+    <div class="form-setting">
         {{#error}}
             <div><span class="error">{{error}}</span></div>
         {{/error}}
         {{{element}}}
         {{#default}}
-            <div class="form-defaultinfo text-muted {{#forceltr}}text-ltr{{/forceltr}}">{{{default}}}</div>
+            <div class="form-defaultinfo {{#forceltr}}text-ltr{{/forceltr}}">{{{default}}}</div>
         {{/default}}
-        <div class="form-description mt-3">{{{description}}}</div>
     </div>
+    <div class="form-description">{{{description}}}</div>
 </div>
diff --git a/theme/boost/templates/core_admin/setting_configcolourpicker.mustache b/theme/bootstrapbase/templates/core_admin/setting_configcolourpicker.mustache
similarity index 67%
rename from theme/boost/templates/core_admin/setting_configcolourpicker.mustache
rename to theme/bootstrapbase/templates/core_admin/setting_configcolourpicker.mustache
index a93872154a1..eb8c4877db4 100644
--- a/theme/boost/templates/core_admin/setting_configcolourpicker.mustache
+++ b/theme/bootstrapbase/templates/core_admin/setting_configcolourpicker.mustache
@@ -15,7 +15,25 @@
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 }}
 {{!
-    Setting configcolourpicker.
+    @template core_admin/setting_configcolourpicker
+
+    Admin setting colour picker template.
+
+    Context variables required for this template:
+    * icon - optional icon context (see pix_icon)
+    * name - element name
+    * id - element id
+    * value - element value
+    * haspreviewconfig - show preview of selected color
+
+    Example context (json):
+    {
+        "icon": false,
+        "name": "name0",
+        "id": "id0",
+        "value": "#555655",
+        "haspreviewconfig": false
+    }
 }}
 <div class="form-colourpicker defaultsnext">
     <div class="admin_colourpicker clearfix">
@@ -23,7 +41,7 @@
             {{>core/pix_icon}}
         {{/icon}}
     </div>
-    <input type="text" name="{{name}}" id="{{id}}" value="{{value}}" size="12" class="form-control text-ltr">
+    <input type="text" name="{{name}}" id="{{id}}" value="{{value}}" size="12" class="text-ltr">
     {{#haspreviewconfig}}
         <input type="button" id="{{id}}_preview" value={{#quote}}{{#str}}preview{{/str}}{{/quote}} class="admin_colourpicker_preview">
     {{/haspreviewconfig}}
diff --git a/theme/boost/templates/core_admin/setting_configselect.mustache b/theme/bootstrapbase/templates/core_admin/setting_configduration.mustache
similarity index 53%
rename from theme/boost/templates/core_admin/setting_configselect.mustache
rename to theme/bootstrapbase/templates/core_admin/setting_configduration.mustache
index 0f5c8ed9d8e..3bad98c30da 100644
--- a/theme/boost/templates/core_admin/setting_configselect.mustache
+++ b/theme/bootstrapbase/templates/core_admin/setting_configduration.mustache
@@ -15,10 +15,28 @@
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 }}
 {{!
-    Setting configselect.
+    @template core_admin/setting_configduration
+
+    Admin duration setting template.
+
+    Context variables required for this template:
+    * name - form element name
+    * options - list of options for units containing name, value, selected
+    * value - yes
+    * id - element id
+
+    Example context (json):
+    {
+        "name": "test",
+        "value": "5",
+        "id": "test0",
+        "options": [ { "name": "Minutes", "value": "mins", "selected": true } ]
+    }
 }}
-<div class="form-select defaultsnext">
-    <select id="{{id}}" name="{{name}}" class="custom-select">
+<div class="form-duration defaultsnext">
+    <input type="text" size="5" id="{{id}}v" name="{{name}}[v]" value="{{value}}" class="text-ltr">
+    <label class="accesshide" for="{{id}}u">{{#str}}durationunits, admin{{/str}}</label>
+    <select id="{{id}}u" name="{{name}}[u]">
         {{#options}}
             <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
         {{/options}}
diff --git a/theme/bootstrapbase/templates/core_admin/setting_configfile.mustache b/theme/bootstrapbase/templates/core_admin/setting_configfile.mustache
new file mode 100644
index 00000000000..f249fe622f8
--- /dev/null
+++ b/theme/bootstrapbase/templates/core_admin/setting_configfile.mustache
@@ -0,0 +1,52 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template core_admin/setting_configfile
+
+    Admin file setting template.
+
+    Context variables required for this template:
+    * name - form element name
+    * id - element id
+    * size - size of the field
+    * readonly - Make the field readonly
+    * value - value
+    * showvalidity - Show a green check if the path is readable
+    * valid - True if the path is readable
+
+    Example context (json):
+    {
+        "name": "test",
+        "value": "/my-super-secret-path/file",
+        "id": "test0",
+        "readonly": true,
+        "showvalidity": true,
+        "valid": false
+    }
+}}
+<div class="form-file defaultsnext">
+    <input type="text" name="{{name}}" id="{{id}}" size="{{size}}" value="{{value}}" class="text-ltr" {{#readonly}}readonly{{/readonly}}>
+    {{#showvalidity}}
+        {{#valid}}
+            <span class="pathok">&#x2714;</span>
+        {{/valid}}
+        {{^valid}}
+            <span class="patherror">&#x2718;</span>
+        {{/valid}}
+    {{/showvalidity}}
+</div>
+
diff --git a/theme/boost/templates/core_admin/setting_configmultiselect.mustache b/theme/bootstrapbase/templates/core_admin/setting_configmultiselect.mustache
similarity index 60%
rename from theme/boost/templates/core_admin/setting_configmultiselect.mustache
rename to theme/bootstrapbase/templates/core_admin/setting_configmultiselect.mustache
index 149f16b0c67..7465a7ba0b6 100644
--- a/theme/boost/templates/core_admin/setting_configmultiselect.mustache
+++ b/theme/bootstrapbase/templates/core_admin/setting_configmultiselect.mustache
@@ -15,11 +15,28 @@
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 }}
 {{!
-    Setting configmultiselect.
+    @template core_admin/setting_configmultiselect
+
+    Admin multiselect setting template.
+
+    Context variables required for this template:
+    * name - form element name
+    * id - element id
+    * size - element size
+    * options - list of options containing name, value, selected
+
+    Example context (json):
+    {
+        "name": "test",
+        "id": "test0",
+        "size": "3",
+        "options": [ { "name": "Option 1", "value": "V", "selected": true },
+                     { "name": "Option 2", "value": "V", "selected": true } ]
+    }
 }}
 <div class="form-select">
     <input type="hidden" name="{{name}}[xxxxx]" value="1">
-    <select id="{{id}}" name="{{name}}[]" size="{{size}}" class="form-control" multiple>
+    <select id="{{id}}" name="{{name}}[]" size="{{size}}" multiple>
         {{#options}}
             <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
         {{/options}}
diff --git a/theme/bootstrapbase/templates/core_admin/setting_configmultiselect_optgroup.mustache b/theme/bootstrapbase/templates/core_admin/setting_configmultiselect_optgroup.mustache
new file mode 100644
index 00000000000..9fa61c54707
--- /dev/null
+++ b/theme/bootstrapbase/templates/core_admin/setting_configmultiselect_optgroup.mustache
@@ -0,0 +1,71 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template core_admin/setting_configmultiselect_optgroup
+
+    Admin multiselect setting template with optgroup support.
+
+    Context variables required for this template:
+    * name - form element name
+    * id - element id
+    * size - element size
+    * options - list of options not grouped
+    * optgroups - list of options grouped containing the group label and for each option: name, value, selected
+
+    Example context (json):
+    {
+        "name": "test",
+        "id": "test0",
+        "size": "3",
+        "options": [
+            { "name": "Option 1", "value": "V", "selected": false },
+            { "name": "Option 2", "value": "V", "selected": true }
+        ],
+        "optgroups": [
+            {
+                "label": "Group 1",
+                "options": [
+                    { "name": "Option 3", "value": "V", "selected": false },
+                    { "name": "Option 4", "value": "V", "selected": true }
+                ]
+            },
+            {
+                "label": "Group 2",
+                "options": [
+                    { "name": "Option 5", "value": "V", "selected": false },
+                    { "name": "Option 6", "value": "V", "selected": true }
+                ]
+            }
+        ]
+    }
+}}
+<div class="form-select">
+    <input type="hidden" name="{{name}}[xxxxx]" value="1">
+    <select id="{{id}}" name="{{name}}[]" size="{{size}}" multiple>
+        {{#options}}
+            <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
+        {{/options}}
+        {{#optgroups}}
+            <optgroup label="{{label}}">
+                {{#options}}
+                    <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
+                {{/options}}
+            </optgroup>
+        {{/optgroups}}
+    </select>
+</div>
+
diff --git a/theme/boost/templates/core_admin/setting_configselect_optgroup.mustache b/theme/bootstrapbase/templates/core_admin/setting_configselect.mustache
similarity index 62%
rename from theme/boost/templates/core_admin/setting_configselect_optgroup.mustache
rename to theme/bootstrapbase/templates/core_admin/setting_configselect.mustache
index 6628240653b..a90c260add8 100644
--- a/theme/boost/templates/core_admin/setting_configselect_optgroup.mustache
+++ b/theme/bootstrapbase/templates/core_admin/setting_configselect.mustache
@@ -15,21 +15,30 @@
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 }}
 {{!
-    Setting configselect with optgroup support.
+    @template core_admin/setting_configselect
+
+    Admin select setting template.
+
+    Context variables required for this template:
+    * name - form element name
+    * id - element id
+    * options - list of options containing name, value, selected
+
+    Example context (json):
+    {
+        "name": "test",
+        "id": "test0",
+        "options": [
+            { "name": "Option 1", "value": "V", "selected": true },
+            { "name": "Option 2", "value": "V", "selected": true }
+        ]
+    }
 }}
 <div class="form-select defaultsnext">
-    <select id="{{id}}" name="{{name}}" class="custom-select">
+    <select id="{{id}}" name="{{name}}">
         {{#options}}
             <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
         {{/options}}
-        {{#optgroups}}
-            <optgroup label="{{label}}">
-                {{#options}}
-                    <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
-                {{/options}}
-            </optgroup>
-        {{/optgroups}}
     </select>
 </div>
 
-
diff --git a/theme/bootstrapbase/templates/core_admin/setting_configselect_optgroup.mustache b/theme/bootstrapbase/templates/core_admin/setting_configselect_optgroup.mustache
new file mode 100644
index 00000000000..ea5da127de6
--- /dev/null
+++ b/theme/bootstrapbase/templates/core_admin/setting_configselect_optgroup.mustache
@@ -0,0 +1,68 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template core_admin/setting_configselect_optgroup
+
+    Admin select with optgroup setting template.
+
+    Context variables required for this template:
+    * name - form element name
+    * id - element id
+    * options - list of options (not grouped)
+    * optgroups - list of options grouped containing the group label and for each option: name, value, selected
+
+    Example context (json):
+    {
+        "name": "test",
+        "id": "test0",
+        "options": [
+            { "name": "Option 1", "value": "V", "selected": false },
+            { "name": "Option 2", "value": "V", "selected": false }
+        ],
+        "optgroups": [
+            {
+                "label": "Group 1",
+                "options": [
+                    { "name": "Option 3", "value": "V", "selected": true },
+                    { "name": "Option 4", "value": "V", "selected": false }
+                ]
+            },
+            {
+                "label": "Group 2",
+                "options": [
+                    { "name": "Option 5", "value": "V", "selected": false },
+                    { "name": "Option 6", "value": "V", "selected": false }
+                ]
+            }
+        ]
+    }
+}}
+<div class="form-select defaultsnext">
+    <select id="{{id}}" name="{{name}}">
+        {{#options}}
+            <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
+        {{/options}}
+        {{#optgroups}}
+            <optgroup label="{{label}}">
+                {{#options}}
+                    <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
+                {{/options}}
+            </optgroup>
+        {{/optgroups}}
+    </select>
+</div>
+
diff --git a/theme/boost/templates/core_admin/setting_configtext.mustache b/theme/bootstrapbase/templates/core_admin/setting_configtext.mustache
similarity index 52%
rename from theme/boost/templates/core_admin/setting_configtext.mustache
rename to theme/bootstrapbase/templates/core_admin/setting_configtext.mustache
index dba4fd74093..236228a7922 100644
--- a/theme/boost/templates/core_admin/setting_configtext.mustache
+++ b/theme/bootstrapbase/templates/core_admin/setting_configtext.mustache
@@ -15,8 +15,28 @@
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 }}
 {{!
-    Setting configtext.
+    @template core_admin/setting_configtext
+
+    Admin text setting template.
+
+    Context variables required for this template:
+    * name - form element name
+    * id - element id
+    * value - element value
+    * size - element size
+    * forceltr - always display as ltr
+    * attributes - list of additional attributes containing name, value
+
+    Example context (json):
+    {
+        "name": "test",
+        "id": "test0",
+        "value": "A tall, dark stranger will have more fun than you.",
+        "size": "21",
+        "forceltr": false,
+        "attributes": [ { "name": "readonly", "value": "readonly" } ]
+    }
 }}
 <div class="form-text defaultsnext">
-    <input type="text" name="{{name}}" value="{{value}}" size="{{size}}" id="{{id}}" class="form-control {{#forceltr}}text-ltr{{/forceltr}}">
+    <input type="text" name="{{name}}" value="{{value}}" size="{{size}}" id="{{id}}" class="{{#forceltr}}text-ltr{{/forceltr}}"{{#attributes}} {{name}}="{{value}}"{{/attributes}}>
 </div>
diff --git a/theme/boost/templates/core_admin/setting_configtextarea.mustache b/theme/bootstrapbase/templates/core_admin/setting_configtextarea.mustache
similarity index 56%
rename from theme/boost/templates/core_admin/setting_configtextarea.mustache
rename to theme/bootstrapbase/templates/core_admin/setting_configtextarea.mustache
index f8430b80245..ec6ded3c9bb 100644
--- a/theme/boost/templates/core_admin/setting_configtextarea.mustache
+++ b/theme/bootstrapbase/templates/core_admin/setting_configtextarea.mustache
@@ -15,8 +15,27 @@
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 }}
 {{!
-    Setting configtextarea.
+    @template core_admin/setting_configtextarea
+
+    Admin textarea setting template.
+
+    Context variables required for this template:
+    * name - form element name
+    * id - element id
+    * rows - number of rows
+    * cols - number of cols
+    * value - default value
+    * forceltr - always display as ltr
+
+    Example context (json):
+    {
+        "name": "test",
+        "cols": "30",
+        "rows": "3",
+        "value": "Excellent day for putting Slinkies on an escalator.",
+        "id": "test0"
+    }
 }}
 <div class="form-textarea">
-    <textarea rows="{{rows}}" cols="{{cols}}" id="{{id}}" name="{{name}}" spellcheck="true" class="form-control {{#forceltr}}text-ltr{{/forceltr}}">{{value}}</textarea>
+    <textarea rows="{{rows}}" cols="{{cols}}" id="{{id}}" name="{{name}}" spellcheck="true" class="{{#forceltr}}text-ltr{{/forceltr}}">{{value}}</textarea>
 </div>
diff --git a/theme/bootstrapbase/templates/core_admin/setting_configtime.mustache b/theme/bootstrapbase/templates/core_admin/setting_configtime.mustache
new file mode 100644
index 00000000000..b86b691d16a
--- /dev/null
+++ b/theme/bootstrapbase/templates/core_admin/setting_configtime.mustache
@@ -0,0 +1,56 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template core_admin/setting_configtime
+
+    Admin time setting template.
+
+    Context variables required for this template:
+    * name - form element name
+    * id - element id
+    * hours - list of valid hour options containing name, value, selected
+    * minutes - list of valid minute options containing name, value, selected
+
+    Example context (json):
+    {
+        "name": "test",
+        "id": "test0",
+        "minutes": [
+            { "name": "00", "value": "0", "selected": true },
+            { "name": "01", "value": "1", "selected": false }
+        ],
+        "hours": [
+            { "name": "1", "value": "1", "selected": true },
+            { "name": "2", "value": "2", "selected": false }
+        ]
+    }
+}}
+<div class="form-time defaultsnext text-ltr">
+    <label class="accesshide" for="{{id}}h">{{#str}}hours{{/str}}</label>
+    <select id="{{id}}h" name="{{name}}[h]">
+        {{#hours}}
+            <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
+        {{/hours}}
+    </select>:
+    <label class="accesshide" for="{{id}}m">{{#str}}minutes{{/str}}</label>
+    <select id="{{id}}m" name="{{name}}[m]">
+        {{#minutes}}
+            <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
+        {{/minutes}}
+    </select>
+</div>
+
diff --git a/theme/boost/templates/core_admin/setting_courselist_frontpage.mustache b/theme/bootstrapbase/templates/core_admin/setting_courselist_frontpage.mustache
similarity index 57%
rename from theme/boost/templates/core_admin/setting_courselist_frontpage.mustache
rename to theme/bootstrapbase/templates/core_admin/setting_courselist_frontpage.mustache
index de5d3421a51..2fe18cc1028 100644
--- a/theme/boost/templates/core_admin/setting_courselist_frontpage.mustache
+++ b/theme/bootstrapbase/templates/core_admin/setting_courselist_frontpage.mustache
@@ -15,11 +15,31 @@
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 }}
 {{!
-    Setting courselist_frontpage.
+    @template core_admin/setting_courselist_frontpage
+
+    Admin courselist_frontpage setting template.
+
+    Context variables required for this template:
+    * selects list of select objects containing id, name, key and options.
+      options is another nested list of items containing name, value and selected
+
+    Example context (json):
+    {
+        "selects": [
+            {
+                "id": "i1",
+                "name": "s1",
+                "key": "k1",
+                "options": [
+                    { "name": "Fish", "value": "snapper", "selected": true }
+                ]
+            }
+        ]
+    }
 }}
 <div class="form-group">
     {{#selects}}
-        <select id="{{id}}{{key}}" name="{{name}}[]" class="custom-select">
+        <select id="{{id}}{{key}}" name="{{name}}[]" class="form-select">
             {{#options}}
                 <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
             {{/options}}
diff --git a/theme/boost/templates/core_admin/setting_description.mustache b/theme/bootstrapbase/templates/core_admin/setting_description.mustache
similarity index 85%
rename from theme/boost/templates/core_admin/setting_description.mustache
rename to theme/bootstrapbase/templates/core_admin/setting_description.mustache
index 09bda33e17b..c6d0e57b1b2 100644
--- a/theme/boost/templates/core_admin/setting_description.mustache
+++ b/theme/bootstrapbase/templates/core_admin/setting_description.mustache
@@ -34,13 +34,12 @@
 {{!
     Setting description.
 }}
-<div class="form-item row">
-    <div class="form-label col-sm-3 text-sm-right">
+<div class="form-item form-horizontal clearfix">
+    <div class="form-label">
         <label>
             {{{title}}}
         </label>
+        <span class="form-shortname ">{{{name}}}</span>
     </div>
-    <div class="form-setting col-sm-9">
-        <div class="form-description">{{{description}}}</div>
-    </div>
-</div>
+    <div class="controls felement fstatic">{{{description}}}</div>
+</div>
\ No newline at end of file
diff --git a/theme/boost/templates/core_admin/setting_devicedetectregex.mustache b/theme/bootstrapbase/templates/core_admin/setting_devicedetectregex.mustache
similarity index 69%
rename from theme/boost/templates/core_admin/setting_devicedetectregex.mustache
rename to theme/bootstrapbase/templates/core_admin/setting_devicedetectregex.mustache
index 7f3ac48a88c..cc8886288a0 100644
--- a/theme/boost/templates/core_admin/setting_devicedetectregex.mustache
+++ b/theme/bootstrapbase/templates/core_admin/setting_devicedetectregex.mustache
@@ -15,9 +15,21 @@
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 }}
 {{!
-    Setting devicedetectregex.
+    @template core_admin/setting_devicedetectregex
+
+    Admin devicedetectregex setting template.
+
+    Context variables required for this template:
+    * expressions - List of expressions containing index, name, expression and value
+
+    Example context (json):
+    {
+        "expressions": [
+            { "index": "i1", "name": "Name", "expression": "/bird|yellow/", "value": "Canary" }
+        ]
+    }
 }}
-<table class="table table-striped">
+<table class="generaltable">
     <thead>
         <tr>
             <th>{{#str}}devicedetectregexexpression, admin{{/str}}</th>
@@ -28,10 +40,10 @@
         {{#expressions}}
             <tr>
                 <td class="c{{index}}">
-                    <input type="text" name="{{name}}[expression{{index}}]" class="form-control" value="{{expression}}">
+                    <input type="text" name="{{name}}[expression{{index}}]" class="form-text text-ltr" value="{{expression}}">
                 </td>
                 <td class="c{{index}}">
-                    <input type="text" name="{{name}}[value{{index}}]" class="form-control" value="{{value}}">
+                    <input type="text" name="{{name}}[value{{index}}]" class="form-text text-ltr" value="{{value}}">
                 </td>
             </tr>
         {{/expressions}}
diff --git a/theme/boost/templates/core_admin/setting_emoticons.mustache b/theme/bootstrapbase/templates/core_admin/setting_emoticons.mustache
similarity index 80%
rename from theme/boost/templates/core_admin/setting_emoticons.mustache
rename to theme/bootstrapbase/templates/core_admin/setting_emoticons.mustache
index fe2c75c26f5..4c36174504e 100644
--- a/theme/boost/templates/core_admin/setting_emoticons.mustache
+++ b/theme/bootstrapbase/templates/core_admin/setting_emoticons.mustache
@@ -15,7 +15,22 @@
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 }}
 {{!
-    Setting emoticons.
+    @template core_admin/setting_emoticons
+
+    Admin emoticons setting template.
+
+    Context variables required for this template:
+    * name - form element name
+    * id - element id
+
+    Example context (json):
+    {
+        "emoticons": [
+            { "fields": [
+                { "name": "Smile", "field": "f1", "value": ":)" }
+            ]}
+        ]
+    }
 }}
 <div class="form-group">
     <table id="emoticonsetting" class="admintable generaltable">
@@ -33,7 +48,7 @@
                 <tr>
                     {{#fields}}
                         <td class="c{{index}}">
-                            <input type="text" name="{{name}}[{{field}}]" class="form-text form-control text-ltr" value="{{value}}">
+                            <input type="text" name="{{name}}[{{field}}]" class="form-text text-ltr" value="{{value}}">
                         </td>
                     {{/fields}}
                     <td>
diff --git a/theme/boost/templates/core_admin/setting_gradecat_combo.mustache b/theme/bootstrapbase/templates/core_admin/setting_gradecat_combo.mustache
similarity index 69%
rename from theme/boost/templates/core_admin/setting_gradecat_combo.mustache
rename to theme/bootstrapbase/templates/core_admin/setting_gradecat_combo.mustache
index b06d29de43d..d64d75fea0d 100644
--- a/theme/boost/templates/core_admin/setting_gradecat_combo.mustache
+++ b/theme/bootstrapbase/templates/core_admin/setting_gradecat_combo.mustache
@@ -15,10 +15,30 @@
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 }}
 {{!
-    Setting configselect.
+    @template core_admin/setting_gradecat_combo
+
+    Admin gradecat_combo setting template.
+
+    Context variables required for this template:
+    * name - form element name
+    * id - element id
+    * options - list of options containing name, value and selected
+    * forced - is it forced
+    * advanced - is it advanced
+
+    Example context (json):
+    {
+        "name": "test",
+        "id": "test0",
+        "options": [
+            { "name": "Option name", "value": "Value", "selected": true }
+        ],
+        "forced": true,
+        "advanced": true
+    }
 }}
 <div class="form-group">
-    <select id="{{id}}" name="{{name}}[value]" class="form-select custom-select">
+    <select id="{{id}}" name="{{name}}[value]" class="form-select">
         {{#options}}
             <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
         {{/options}}
diff --git a/theme/boost/templates/core_admin/settings.mustache b/theme/bootstrapbase/templates/core_admin/settings.mustache
similarity index 62%
rename from theme/boost/templates/core_admin/settings.mustache
rename to theme/bootstrapbase/templates/core_admin/settings.mustache
index c75925ad595..009730532f3 100644
--- a/theme/boost/templates/core_admin/settings.mustache
+++ b/theme/bootstrapbase/templates/core_admin/settings.mustache
@@ -15,10 +15,29 @@
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 }}
 {{!
-    Settings.
+    @template core_admin/settings
+
+    Admin settings form template.
+
+    Context variables required for this template:
+    * actionurl - url to submit to
+    * params - list of parameters containing name and value
+    * return - page to return to
+    * title - form title
+    * settings - raw html for settings
+    * showsave - true if we need save buttons
+
+    Example context (json):
+    {
+        "actionurl": "/",
+        "return": "/",
+        "title": "Settings Form",
+        "settings": "RAW HTML",
+        "showsave": true
+    }
 }}
 <form action="{{actionurl}}" method="post" id="adminsettings">
-    <div class="settingsform">
+    <div class="settingsform clearfix">
         {{#params}}
             <input type="hidden" name="{{name}}" value="{{value}}">
             <input type="hidden" name="action" value="save-settings">
@@ -30,10 +49,8 @@
         {{/title}}
         {{{settings}}}
         {{#showsave}}
-            <div class="row">
-                <div class="offset-sm-3 col-sm-3">
-                    <button type="submit" class="btn btn-primary">{{#str}}savechanges, admin{{/str}}</button>
-                </div>
+            <div class="form-buttons">
+                <input type="submit" class="form-submit" value={{#quote}}{{#str}}savechanges, admin{{/str}}{{/quote}}>
             </div>
         {{/showsave}}
     </div>
diff --git a/theme/boost/templates/core_admin/settings_search_results.mustache b/theme/bootstrapbase/templates/core_admin/settings_search_results.mustache
similarity index 91%
rename from theme/boost/templates/core_admin/settings_search_results.mustache
rename to theme/bootstrapbase/templates/core_admin/settings_search_results.mustache
index 66531548b66..df82b0ff616 100644
--- a/theme/boost/templates/core_admin/settings_search_results.mustache
+++ b/theme/bootstrapbase/templates/core_admin/settings_search_results.mustache
@@ -58,10 +58,8 @@
                 </fieldset>
             {{/results}}
             {{#showsave}}
-                <div class="row">
-                    <div class="offset-sm-3 col-sm-3">
-                        <button type="submit" class="btn btn-primary">{{#str}}savechanges, admin{{/str}}</button>
-                    </div>
+                <div class="form-buttons">
+                    <input type="submit" class="form-submit" value={{#quote}}{{#str}}savechanges, admin{{/str}}{{/quote}}>
                 </div>
             {{/showsave}}
         {{/hasresults}}