diff --git a/admin/tool/lp/templates/competency_plan_navigation.mustache b/admin/tool/lp/templates/competency_plan_navigation.mustache
index 92add2659af..66747cbe855 100644
--- a/admin/tool/lp/templates/competency_plan_navigation.mustache
+++ b/admin/tool/lp/templates/competency_plan_navigation.mustache
@@ -32,7 +32,7 @@
 
     // No example context because the JS is connected to webservices
 }}
-<div class="float-sm-right card card-block">
+<div class="float-sm-right border p-2 mb-2">
 {{#hascompetencies}}
 <span>
 <label for="competency-nav-{{uniqid}}" class="accesshide">{{#str}}jumptocompetency, tool_lp{{/str}}</label>
diff --git a/admin/tool/lp/templates/course_competencies_page.mustache b/admin/tool/lp/templates/course_competencies_page.mustache
index 8de78a04c54..6d3622b8218 100644
--- a/admin/tool/lp/templates/course_competencies_page.mustache
+++ b/admin/tool/lp/templates/course_competencies_page.mustache
@@ -82,7 +82,7 @@
         {{/comppath}}
         {{#usercompetencycourse}}
             {{#grade}}
-            <span class="badge {{^proficiency}}badge-danger{{/proficiency}}">{{gradename}}</span>
+            <span class="badge {{#proficiency}}badge-success{{/proficiency}}{{^proficiency}}badge-danger{{/proficiency}}">{{gradename}}</span>
             {{/grade}}
         {{/usercompetencycourse}}
         {{#canmanagecoursecompetencies}}
diff --git a/admin/tool/lp/templates/course_competency_statistics.mustache b/admin/tool/lp/templates/course_competency_statistics.mustache
index 31260af1d28..73c74de8f42 100644
--- a/admin/tool/lp/templates/course_competency_statistics.mustache
+++ b/admin/tool/lp/templates/course_competency_statistics.mustache
@@ -49,7 +49,7 @@
     Template statistics template.
 }}
 {{#competencycount}}
-<div data-region="coursecompetencystatistics" class="card">
+<div data-region="coursecompetencystatistics" class="border p-2 mb-2">
     {{#canbegradedincourse}}
         {{< tool_lp/progress_bar}}
             {{$progresstext}}
diff --git a/admin/tool/lp/templates/evidence_summary.mustache b/admin/tool/lp/templates/evidence_summary.mustache
index 83984da434f..5033ce977d8 100644
--- a/admin/tool/lp/templates/evidence_summary.mustache
+++ b/admin/tool/lp/templates/evidence_summary.mustache
@@ -44,7 +44,7 @@
       "id": 1
     }
 }}
-<div class="card well-small evidence" data-region="evidence" data-id="{{id}}">
+<div class="border p-2 mb-2 evidence" data-region="evidence" data-id="{{id}}">
     {{#candelete}}
         <div class="float-sm-right">
             <a href="#" data-action="delete-evidence">{{#pix}}t/delete{{/pix}}</a>
diff --git a/admin/tool/lp/templates/manage_competencies_page.mustache b/admin/tool/lp/templates/manage_competencies_page.mustache
index 92354ec7212..ccc67ba15af 100644
--- a/admin/tool/lp/templates/manage_competencies_page.mustache
+++ b/admin/tool/lp/templates/manage_competencies_page.mustache
@@ -50,10 +50,12 @@
         <div class="col-lg-6">
             <p>
                 <form data-region="filtercompetencies" data-frameworkid="{{framework.id}}" class="form-inline">
-                    <div class="form-group">
+                    <div class="input-group mb-3">
                         <label class="accesshide" for="filter{{uniqid}}">{{#str}}search, tool_lp{{/str}}</label>
                         <input class="form-control" type="text" id="filter{{uniqid}}" placeholder="{{#str}}search, tool_lp{{/str}}" value="{{search}}">
-                        <button class="btn btn-secondary">{{#pix}}a/search, , {{#str}}search{{/str}}{{/pix}}</button>
+                        <div class="input-group-append">
+                            <button class="btn btn-secondary">{{#pix}}a/search, , {{#str}}search{{/str}}{{/pix}}</button>
+                        </div>
                     </div>
                 </form>
             </p>
@@ -62,8 +64,8 @@
             </ul>
         </div>
 
-        <div class="card col-lg-6">
-            <div class="card-block card-body">
+        <div class="col-lg-6">
+            <div class="border p-2 mb-2">
                 <div class="card-title">
                     <h4 data-region="selected-competency">{{#str}}selectedcompetency, tool_lp{{/str}}</h4>
                         <span data-region="competencyactionsmenu" class="float-sm-right">
diff --git a/admin/tool/lp/templates/module_navigation.mustache b/admin/tool/lp/templates/module_navigation.mustache
index 6fd1da9bd04..4b68402c0a9 100644
--- a/admin/tool/lp/templates/module_navigation.mustache
+++ b/admin/tool/lp/templates/module_navigation.mustache
@@ -28,7 +28,7 @@
 
     // No example context because the JS is connected to webservices
 }}
-<div class="float-right card p-2">
+<div class="float-right border mb-2 p-2">
 <form class="user-competency-course-navigation">
 <input type="hidden" name="courseid" value="{{courseid}}"/>
 <input type="hidden" name="mod" value="{{moduleid}}"/>
diff --git a/admin/tool/lp/templates/template_competencies_page.mustache b/admin/tool/lp/templates/template_competencies_page.mustache
index aa3895c6627..e5f7ca29f3a 100644
--- a/admin/tool/lp/templates/template_competencies_page.mustache
+++ b/admin/tool/lp/templates/template_competencies_page.mustache
@@ -26,10 +26,8 @@
     </h2>
     <div>{{{template.description}}}</div>
     {{#canmanagetemplatecompetencies}}
-    <div data-region="actions" class="clearfix">
-        <div class="float-left">
-            <button disabled class="btn btn-secondary">{{#str}}addtemplatecompetencies, tool_lp{{/str}}</button>
-        </div>
+    <div data-region="actions" class="my-4">
+        <button disabled class="btn btn-secondary">{{#str}}addtemplatecompetencies, tool_lp{{/str}}</button>
     </div>
     {{/canmanagetemplatecompetencies}}
     <h3 class="mt-1">{{#str}}templatecompetencies, tool_lp{{/str}}</h3>
@@ -41,7 +39,7 @@
             <div class="drag-parentnode">
                 {{#competencies}}
                 <div class="drag-samenode" data-id="{{competency.id}}">
-                    <div class="card">
+                    <div class="border p-2 mb-2">
                         {{#canmanagetemplatecompetencies}}
                         <span class="drag-handlecontainer float-left"></span>
                         <div class="float-sm-right">
diff --git a/admin/tool/lp/templates/template_statistics.mustache b/admin/tool/lp/templates/template_statistics.mustache
index 9751cbd09ea..418b4934b9e 100644
--- a/admin/tool/lp/templates/template_statistics.mustache
+++ b/admin/tool/lp/templates/template_statistics.mustache
@@ -45,8 +45,7 @@
     Template statistics template.
 }}
 {{#competencycount}}
-<div data-region="templatestatistics" class="card">
-    <div class="card-block">
+<div data-region="templatestatistics" class="border p-2 mb-2">
     {{< tool_lp/progress_bar}}
         {{$progresstext}}
             {{#str}}xcompetencieslinkedoutofy, tool_lp, { "x": "{{linkedcompetencycount}}", "y": "{{competencycount}}" } {{/str}}
@@ -90,6 +89,5 @@
         </div>
     </div>
     {{/leastproficientcount}}
-    </div>
 </div>
 {{/competencycount}}
diff --git a/admin/tool/lp/templates/user_competency_course_navigation.mustache b/admin/tool/lp/templates/user_competency_course_navigation.mustache
index 9bced6b0e28..2a9f2deeda4 100644
--- a/admin/tool/lp/templates/user_competency_course_navigation.mustache
+++ b/admin/tool/lp/templates/user_competency_course_navigation.mustache
@@ -35,7 +35,7 @@
 
     // No example context because the JS is connected to webservices
 }}
-<div class="float-sm-right card card-block p-x-1 p-b-1">
+<div class="float-sm-right border p-2 mb-2">
 <p>{{{groupselector}}}</p>
 <form class="user-competency-course-navigation">
 <input type="hidden" name="userid" value="{{userid}}"/>
diff --git a/admin/tool/lp/templates/user_competency_summary.mustache b/admin/tool/lp/templates/user_competency_summary.mustache
index 4ee61f12b54..863aaed949d 100644
--- a/admin/tool/lp/templates/user_competency_summary.mustache
+++ b/admin/tool/lp/templates/user_competency_summary.mustache
@@ -57,7 +57,7 @@
         </dd>
         <dt>{{#str}}proficient, tool_lp{{/str}}</dt>
         <dd>
-            <span class="badge{{^proficiency}} badge-danger{{/proficiency}} float-left">
+            <span class="badge {{#proficiency}}badge-success{{/proficiency}}{{^proficiency}}badge-danger{{/proficiency}} float-left">
                 {{proficiencyname}}
             </span>
         </dd>
diff --git a/admin/tool/lp/templates/user_competency_summary_in_course.mustache b/admin/tool/lp/templates/user_competency_summary_in_course.mustache
index a5acf4f7475..fe97642fd17 100644
--- a/admin/tool/lp/templates/user_competency_summary_in_course.mustache
+++ b/admin/tool/lp/templates/user_competency_summary_in_course.mustache
@@ -81,7 +81,7 @@
         {{#usercompetencycourse}}
         <dt>{{#str}}proficient, tool_lp{{/str}}</dt>
         <dd>
-            <span class="badge{{^proficiency}} badge-danger{{/proficiency}} float-left">
+            <span class="badge {{#proficiency}}badge-success{{/proficiency}}{{^proficiency}}badge-danger{{/proficiency}} float-left">
                 {{proficiencyname}}
             </span>
         </dd>
diff --git a/admin/tool/lp/templates/user_competency_summary_in_plan.mustache b/admin/tool/lp/templates/user_competency_summary_in_plan.mustache
index 60ec206b0b9..bb13c95f659 100644
--- a/admin/tool/lp/templates/user_competency_summary_in_plan.mustache
+++ b/admin/tool/lp/templates/user_competency_summary_in_plan.mustache
@@ -68,7 +68,7 @@
         </dd>
         <dt>{{#str}}proficient, tool_lp{{/str}}</dt>
         <dd>
-            <span class="badge{{^proficiency}} badge-danger{{/proficiency}} float-left">
+            <span class="badge {{#proficiency}}badge-success{{/proficiency}}{{^proficiency}}badge-danger{{/proficiency}} float-left">
                 {{proficiencyname}}
             </span>
         </dd>
@@ -101,7 +101,7 @@
         <dd>{{gradename}} - {{#str}}plancompleted, tool_lp{{/str}}</dd>
         <dt>{{#str}}proficient, tool_lp{{/str}}</dt>
         <dd>
-            <span class="badge{{^proficiency}} badge-danger{{/proficiency}} float-left">
+            <span class="badge {{#proficiency}}badge-success{{/proficiency}}{{^proficiency}}badge-danger{{/proficiency}} float-left">
                 {{proficiencyname}}
             </span>
         </dd>
diff --git a/report/competency/templates/user_course_navigation.mustache b/report/competency/templates/user_course_navigation.mustache
index 2ee65645408..ede90c5a1bc 100644
--- a/report/competency/templates/user_course_navigation.mustache
+++ b/report/competency/templates/user_course_navigation.mustache
@@ -22,7 +22,7 @@
     Example context (json):
     { "hasusers": false, "hasmodules": false}
 }}
-<div class="float-right card p-x-1 p-b-1">
+<div class="float-right border p-2 mb-2">
 <p>{{{groupselector}}}</p>
 <form class="user-competency-course-navigation">
 <input type="hidden" name="user" value="{{userid}}"/>